Changeset 205805 in webkit

Timestamp:

Sep 12, 2016 2:26:19 AM (8 years ago)

Author:

Chris Dumez

Message:

Start using Document::pageCacheState() instead of Document::inPageCache()
​https://bugs.webkit.org/show_bug.cgi?id=161851

Reviewed by Ryosuke Niwa.

Start using Document::pageCacheState() instead of Document::inPageCache()
as the latter one is confusing (given that it is true when firing the
pagehide event, when the document is about to enter page cache).

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::closeURL):
(WebCore::FrameLoader::clear):
(WebCore::FrameLoader::dispatchUnloadEvents):

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::load):

• page/Page.cpp:

(WebCore::incrementFrame): Deleted.

• page/Page.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (6 diffs)
• loader/cache/CachedResource.cpp (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)
• page/Page.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-12  Chris Dumez  <cdumez@apple.com>
+
+        Start using Document::pageCacheState() instead of Document::inPageCache()
+        https://bugs.webkit.org/show_bug.cgi?id=161851
+
+        Reviewed by Ryosuke Niwa.
+
+        Start using Document::pageCacheState() instead of Document::inPageCache()
+        as the latter one is confusing (given that it is true when firing the
+        pagehide event, when the document is about to enter page cache).
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::closeURL):
+        (WebCore::FrameLoader::clear):
+        (WebCore::FrameLoader::dispatchUnloadEvents):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        * page/Page.cpp:
+        (WebCore::incrementFrame): Deleted.
+        * page/Page.h:
+
 2016-09-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -518 +518 @@
     } else {
         // Should only send the pagehide event here if the current document exists and has not been placed in the page cache.
-        unloadEventPolicy = currentDocument && !currentDocument->inPageCache() ? UnloadEventPolicyUnloadAndPageHide : UnloadEventPolicyUnloadOnly;
+        unloadEventPolicy = currentDocument && currentDocument->pageCacheState() == Document::NotInPageCache ? UnloadEventPolicyUnloadAndPageHide : UnloadEventPolicyUnloadOnly;
     }
 
@@ -591 +591 @@
     m_needsClear = false;
     
-    if (!m_frame.document()->inPageCache()) {
+    if (m_frame.document()->pageCacheState() != Document::InPageCache) {
         m_frame.document()->cancelParsing();
         m_frame.document()->stopActiveDOMObjects();
@@ -604 +604 @@
         InspectorInstrumentation::frameWindowDiscarded(&m_frame, m_frame.document()->domWindow());
         m_frame.document()->domWindow()->resetUnlessSuspendedForDocumentSuspension();
-        m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->inPageCache());
+        m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->pageCacheState() == Document::AboutToEnterPageCache);
     }
 
@@ -2925 +2925 @@
             if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide) {
                 m_pageDismissalEventBeingDispatched = PageDismissalType::PageHide;
-                m_frame.document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame.document()->inPageCache()), m_frame.document());
+                m_frame.document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame.document()->pageCacheState() == Document::AboutToEnterPageCache), m_frame.document());
             }
 
@@ -2931 +2931 @@
             // https://bugs.webkit.org/show_bug.cgi?id=116770
 
-            if (!m_frame.document()->inPageCache()) {
+            if (m_frame.document()->pageCacheState() == Document::NotInPageCache) {
                 Ref<Event> unloadEvent(Event::create(eventNames().unloadEvent, false, false));
                 // The DocumentLoader (and thus its LoadTiming) might get destroyed
@@ -2957 +2957 @@
         return;
 
-    if (m_frame.document()->inPageCache())
+    if (m_frame.document()->pageCacheState() != Document::NotInPageCache)
         return;
 

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -269 +269 @@
 
     // Prevent new loads if we are in the PageCache or being added to the PageCache.
-    if (frame.page() && frame.page()->inPageCache()) {
-        failBeforeStarting();
-        return;
+    // We query the top document because new frames may be created in pagehide event handlers
+    // and their pageCacheState will not reflect the fact that they are about to enter page
+    // cache.
+    if (auto* topDocument = frame.mainFrame().document()) {
+        if (topDocument->pageCacheState() != Document::NotInPageCache) {
+            failBeforeStarting();
+            return;
+        }
     }
 

trunk/Source/WebCore/page/Page.cpp

@@ -580 +580 @@
 }
 
-bool Page::inPageCache() const
-{
-    auto* document = mainFrame().document();
-    return document && document->inPageCache();
-}
-
 static Frame* incrementFrame(Frame* curr, bool forward, bool wrapFlag)
 {

trunk/Source/WebCore/page/Page.h

@@ -167 +167 @@
     const MainFrame& mainFrame() const { return m_mainFrame.get(); }
 
-    bool inPageCache() const;
-
     bool openedByDOM() const;
     void setOpenedByDOM();