From 00812e30dfa70f9b1a752cf0d09de00f6d401c85 Mon Sep 17 00:00:00 2001 From: win7-7 Date: Wed, 26 Jun 2019 01:51:45 +0300 Subject: Attach FrameProperties to each frame instead of using a shared hashtable Dispense the shared hashtable and instead attach the frame property list directly to nsIFrame. --- layout/base/nsPresShell.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'layout/base/nsPresShell.h') diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h index 1a8dd3fef..10548880a 100644 --- a/layout/base/nsPresShell.h +++ b/layout/base/nsPresShell.h @@ -384,11 +384,12 @@ public: virtual void LoadComplete() override; void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf, - nsArenaMemoryStats *aArenaObjectsSize, - size_t *aPresShellSize, - size_t *aStyleSetsSize, - size_t *aTextRunsSize, - size_t *aPresContextSize) override; + nsArenaMemoryStats* aArenaObjectsSize, + size_t* aPresShellSize, + size_t* aStyleSetsSize, + size_t* aTextRunsSize, + size_t* aPresContextSize, + size_t* aFramePropertiesSize) override; size_t SizeOfTextRuns(mozilla::MallocSizeOf aMallocSizeOf) const; virtual void AddInvalidateHiddenPresShellObserver(nsRefreshDriver *aDriver) override; -- cgit v1.2.3 From 7979df5512bef6e1a67fbcc390817128fd4e7743 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 18 Jul 2019 19:09:05 +0200 Subject: 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. --- layout/base/nsPresShell.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'layout/base/nsPresShell.h') diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h index 10548880a..f20370d73 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; }; -- cgit v1.2.3