mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 00:37:32 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
commit
2afee714fb
202 changed files with 290 additions and 13907 deletions
|
|
@ -62,7 +62,7 @@ protected:
|
|||
*
|
||||
* To use this class, declare a global (i.e., file, class or function-scope
|
||||
* static member) FramePropertyDescriptor and pass its address as
|
||||
* aProperty in the FramePropertyTable methods.
|
||||
* aProperty in the FrameProperties methods.
|
||||
*/
|
||||
template<typename T>
|
||||
struct FramePropertyDescriptor : public FramePropertyDescriptorUntyped
|
||||
|
|
|
|||
|
|
@ -8178,9 +8178,6 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent,
|
|||
}
|
||||
}
|
||||
}
|
||||
if (aEvent->mMessage == eKeyDown) {
|
||||
mIsLastKeyDownCanceled = aEvent->mFlags.mDefaultPrevented;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case eMouseUp:
|
||||
|
|
@ -8970,9 +8967,6 @@ PresShell::FireOrClearDelayedEvents(bool aFireEvents)
|
|||
!doc->EventHandlingSuppressed()) {
|
||||
nsAutoPtr<DelayedEvent> ev(mDelayedEvents[0].forget());
|
||||
mDelayedEvents.RemoveElementAt(0);
|
||||
if (ev->IsKeyPressEvent() && mIsLastKeyDownCanceled) {
|
||||
continue;
|
||||
}
|
||||
ev->Dispatch();
|
||||
}
|
||||
if (!doc->EventHandlingSuppressed()) {
|
||||
|
|
@ -9767,12 +9761,6 @@ PresShell::DelayedKeyEvent::DelayedKeyEvent(WidgetKeyboardEvent* aEvent) :
|
|||
mEvent = keyEvent;
|
||||
}
|
||||
|
||||
bool
|
||||
PresShell::DelayedKeyEvent::IsKeyPressEvent()
|
||||
{
|
||||
return mEvent->mMessage == eKeyPress;
|
||||
}
|
||||
|
||||
// Start of DEBUG only code
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
|||
|
|
@ -618,7 +618,6 @@ protected:
|
|||
public:
|
||||
virtual ~DelayedEvent() { }
|
||||
virtual void Dispatch() { }
|
||||
virtual bool IsKeyPressEvent() { return false; }
|
||||
};
|
||||
|
||||
class DelayedInputEvent : public DelayedEvent
|
||||
|
|
@ -643,7 +642,6 @@ protected:
|
|||
{
|
||||
public:
|
||||
explicit DelayedKeyEvent(mozilla::WidgetKeyboardEvent* aEvent);
|
||||
virtual bool IsKeyPressEvent() override;
|
||||
};
|
||||
|
||||
// Check if aEvent is a mouse event and record the mouse location for later
|
||||
|
|
@ -954,8 +952,6 @@ protected:
|
|||
// Whether the widget has received a paint message yet.
|
||||
bool mHasReceivedPaintMessage : 1;
|
||||
|
||||
bool mIsLastKeyDownCanceled : 1;
|
||||
|
||||
static bool sDisableNonTestMouseEvents;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ public:
|
|||
#define NS_DECLARE_FRAME_PROPERTY_WITH_DTOR_NEVER_CALLED(prop, type) \
|
||||
static void AssertOnDestroyingProperty##prop(type*) { \
|
||||
MOZ_ASSERT_UNREACHABLE("Frame property " #prop " should never " \
|
||||
"be destroyed by the FramePropertyTable"); \
|
||||
"be destroyed by the FrameProperties class"); \
|
||||
} \
|
||||
NS_DECLARE_FRAME_PROPERTY_WITH_DTOR(prop, type, \
|
||||
AssertOnDestroyingProperty##prop)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue