diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-07-18 19:09:05 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-07-18 19:21:07 +0200 |
commit | 7979df5512bef6e1a67fbcc390817128fd4e7743 (patch) | |
tree | 9b9c63a801f3532f3b9d70d2d6e0eafe28c685f4 /layout | |
parent | a4f56a43b634658ee5d6047490fb3a5c24bbee3c (diff) | |
download | uxp-7979df5512bef6e1a67fbcc390817128fd4e7743.tar.gz |
Revert "Capture delayed events and cancel as necessary."
Tag #1052 (backout).
Backed out for creating issues like #1191 and other issue-less problems
with e.g. losing the caret from text boxes. Of note: this was also
backed out from m-c for similar reasons in Bug 1332433.
This fixes #1191.
This reverts commit 3424afccaebc71c4acd4fa9eadf519c408c5965b.
Diffstat (limited to 'layout')
-rw-r--r-- | layout/base/nsPresShell.cpp | 12 | ||||
-rw-r--r-- | layout/base/nsPresShell.h | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index dacc6603b5..264b52b18d 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -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 diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h index 10548880a9..f20370d73a 100644 --- a/layout/base/nsPresShell.h +++ b/layout/base/nsPresShell.h @@ -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; }; |