Changeset 214801 in webkit

Timestamp:

Apr 3, 2017 9:46:21 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214392 - media/restore-from-page-cache.html causes NoEventDispatchAssertion::isEventAllowedInMainThread() assertion failure
​https://bugs.webkit.org/show_bug.cgi?id=170087
<rdar://problem/31254822>

Reviewed by Simon Fraser.

Reduce the scope of code that should never dispatch DOM events so as to allow updating contents size
after restoring a page from the page cache.

In r214014 we instantiate a NoEventDispatchAssertion in FrameLoader::commitProvisionalLoad()
around the call to CachedPage::restore() to assert when a DOM event is dispatched during
page restoration as such events can cause re-entrancy into the page cache. As it turns out
it is sufficient to ensure that no DOM events are dispatched after restoring all cached frames
as opposed to after CachedPage::restore() returns.

Also rename Document::enqueue{Pageshow, Popstate}Event() to dispatch{Pageshow, Popstate}Event(),
respectively, since they synchronously dispatch events :(. We hope in the future to make them
asynchronously dispatch events.

• dom/Document.cpp:

(WebCore::Document::implicitClose): Update for renaming.
(WebCore::Document::statePopped): Ditto.
(WebCore::Document::dispatchPageshowEvent): Renamed; formerly named enqueuePageshowEvent().
(WebCore::Document::dispatchPopstateEvent): Renamed; formerly named enqueuePopstateEvent().
(WebCore::Document::enqueuePageshowEvent): Deleted.
(WebCore::Document::enqueuePopstateEvent): Deleted.

• dom/Document.h:
• history/CachedPage.cpp:

(WebCore::firePageShowAndPopStateEvents): Moved logic from FrameLoader::didRestoreFromCachedPage() to here.
(WebCore::CachedPage::restore): Modified to call firePageShowAndPopStateEvents().

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::commitProvisionalLoad): Removed use of NoEventDispatchAssertion RAII object. We
will instantiate it in CachedPage::restore() with a smaller scope.
(WebCore::FrameLoader::didRestoreFromCachedPage): Deleted; moved logic from here to WebCore::firePageShowAndPopStateEvents().

• loader/FrameLoader.h:

File:

• releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (modified) (1 diff)

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-24  Daniel Bates  <dabates@apple.com>
+
+        media/restore-from-page-cache.html causes NoEventDispatchAssertion::isEventAllowedInMainThread() assertion failure
+        https://bugs.webkit.org/show_bug.cgi?id=170087
+        <rdar://problem/31254822>
+
+        Reviewed by Simon Fraser.
+
+        Reduce the scope of code that should never dispatch DOM events so as to allow updating contents size
+        after restoring a page from the page cache.
+
+        In r214014 we instantiate a NoEventDispatchAssertion in FrameLoader::commitProvisionalLoad()
+        around the call to CachedPage::restore() to assert when a DOM event is dispatched during
+        page restoration as such events can cause re-entrancy into the page cache. As it turns out
+        it is sufficient to ensure that no DOM events are dispatched after restoring all cached frames
+        as opposed to after CachedPage::restore() returns.
+
+        Also rename Document::enqueue{Pageshow, Popstate}Event() to dispatch{Pageshow, Popstate}Event(),
+        respectively, since they synchronously dispatch events :(. We hope in the future to make them
+        asynchronously dispatch events.
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitClose): Update for renaming.
+        (WebCore::Document::statePopped): Ditto.
+        (WebCore::Document::dispatchPageshowEvent): Renamed; formerly named enqueuePageshowEvent().
+        (WebCore::Document::dispatchPopstateEvent): Renamed; formerly named enqueuePopstateEvent().
+        (WebCore::Document::enqueuePageshowEvent): Deleted.
+        (WebCore::Document::enqueuePopstateEvent): Deleted.
+        * dom/Document.h:
+        * history/CachedPage.cpp:
+        (WebCore::firePageShowAndPopStateEvents): Moved logic from FrameLoader::didRestoreFromCachedPage() to here.
+        (WebCore::CachedPage::restore): Modified to call firePageShowAndPopStateEvents().
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::commitProvisionalLoad): Removed use of NoEventDispatchAssertion RAII object. We
+        will instantiate it in CachedPage::restore() with a smaller scope.
+        (WebCore::FrameLoader::didRestoreFromCachedPage): Deleted; moved logic from here to WebCore::firePageShowAndPopStateEvents().
+        * loader/FrameLoader.h:
+
 2017-03-24  Brady Eidson  <beidson@apple.com>