Changeset 61801 in webkit

Timestamp:

Jun 24, 2010 4:58:36 PM (14 years ago)

Author:

ap@apple.com

Message:

Reviewed by Brady Eidson.

​https://bugs.webkit.org/show_bug.cgi?id=41178
Timed refresh in subframes isn't stopped when going into b/f cache

Test: fast/history/timed-refresh-in-cached-frame.html

• history/CachedFrame.cpp: (WebCore::CachedFrame::CachedFrame): Top frame's stopLoading() won't help cached subframes; stop loading from here.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::stopLoading): Don't stop loading in child frames. This didn't work for cached frames due to frame tree having been already desonstructed, and it's not necessary in non-cached case because stopLoading() will be called for subframes via FrameLoader::detachFromParent() and closeURL(). (WebCore::FrameLoader::pageHidden): This was a second code path that dispatched pagehide event - it's no longer needed, because everything goes through FrameLoader::stopLoading(). (WebCore::FrameLoader::commitProvisionalLoad): Don't call pageHidden(), the code for adding frame to b/f cache will do everything.

• loader/FrameLoader.h: Removed pageHidden().

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/history/timed-refresh-in-cached-frame-expected.txt (added)
• LayoutTests/fast/history/timed-refresh-in-cached-frame.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/history/CachedFrame.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (3 diffs)
• WebCore/loader/FrameLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-24  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41178
+        Timed refresh in subframes isn't stopped when going into b/f cache
+
+        This is a slow test, because a fast redirect results in replacing the current item in b/f
+        list, so back/forward cache doesn't get involved. But this code path must be tested.
+
+        * fast/history/timed-refresh-in-cached-frame-expected.txt: Added.
+        * fast/history/timed-refresh-in-cached-frame.html: Added.
+
 2010-06-24  Peter Kasting  <pkasting@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-24  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41178
+        Timed refresh in subframes isn't stopped when going into b/f cache
+
+        Test: fast/history/timed-refresh-in-cached-frame.html
+
+        * history/CachedFrame.cpp: (WebCore::CachedFrame::CachedFrame): Top frame's stopLoading()
+        won't help cached subframes; stop loading from here.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading): Don't stop loading in child frames. This didn't work
+        for cached frames due to frame tree having been already desonstructed, and it's not necessary
+        in non-cached case because stopLoading() will be called for subframes via
+        FrameLoader::detachFromParent() and closeURL().
+        (WebCore::FrameLoader::pageHidden): This was a second code path that dispatched pagehide
+        event - it's no longer needed, because everything goes through FrameLoader::stopLoading().
+        (WebCore::FrameLoader::commitProvisionalLoad): Don't call pageHidden(), the code for adding
+        frame to b/f cache will do everything.
+
+        * loader/FrameLoader.h: Removed pageHidden().
+
 2010-06-24  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/history/CachedFrame.cpp

@@ -130 +130 @@
     m_view->detachCustomScrollbars();
 
-    m_document->documentWillBecomeInactive(); 
+    m_document->documentWillBecomeInactive();
     frame->clearTimers();
     m_document->setInPageCache(true);
+    frame->loader()->stopLoading(UnloadEventPolicyUnloadAndPageHide);
     
     frame->loader()->client()->savePlatformDataToCachedFrame(this);

trunk/WebCore/loader/FrameLoader.cpp

@@ -492 +492 @@
     }
 
-    // tell all subframes to stop as well
-    for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
-        child->loader()->stopLoading(unloadEventPolicy);
-
+    // FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
     m_frame->redirectScheduler()->cancel();
 }
@@ -1890 +1887 @@
     // We are doing this here because we know for sure that a new page is about to be loaded.
     HistoryItem* item = history()->currentItem();
-    if (!m_frame->tree()->parent() && PageCache::canCache(m_frame->page()) && !item->isInPageCache()) {
-        pageHidden();
+    if (!m_frame->tree()->parent() && PageCache::canCache(m_frame->page()) && !item->isInPageCache())
         pageCache()->add(item, m_frame->page());
-    }
     
     if (m_loadType != FrameLoadTypeReplace)
@@ -3127 +3122 @@
     provisionalLoader->setCommitted(true);
     commitProvisionalLoad();
-}
-
-void FrameLoader::pageHidden()
-{
-    m_pageDismissalEventBeingDispatched = true;
-    if (m_frame->domWindow())
-        m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, true), m_frame->document());
-    m_pageDismissalEventBeingDispatched = false;
-
-    // Send pagehide event for subframes as well
-    for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
-        child->loader()->pageHidden();
 }
 

trunk/WebCore/loader/FrameLoader.h

@@ -346 +346 @@
     
     void loadProvisionalItemFromCachedPage();
-    void pageHidden();
 
     void receivedFirstData();