Changeset 48036 in webkit

Timestamp:

Sep 3, 2009, 4:57:28 PM (16 years ago)

Author:

[email protected]

Message:

WebCore: Page Cache should support pages with Frames.
​https://bugs.webkit.org/show_bug.cgi?id=13631

Reviewed by Sam Weinig.

Tests: fast/events/pageshow-pagehide-on-back-cached-with-frames.html

fast/loader/frames-with-unload-handlers-in-page-cache.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::canCachePageContainingThisFrame):
(WebCore::FrameLoader::logCanCacheFrameDecision):

LayoutTests: Page Cache should support pages with Frames.
​https://bugs.webkit.org/show_bug.cgi?id=13631

Reviewed by Sam Weinig.

• fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt: Added.
• fast/events/pageshow-pagehide-on-back-cached-with-frames.html: Added.
• fast/events/resources/pageshow-pagehide-subframe-cachable.html: Added.
• fast/events/resources/pageshow-pagehide-subsubframe-cachable.html: Added.
• fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt: Added.
• fast/loader/frames-with-unload-handlers-in-page-cache.html: Added.
• fast/loader/resources/notify-done.html: Added.
• fast/loader/resources/subframe-with-subsubframe-with-unload-handler.html: Added.
• fast/loader/resources/subframe-with-unload-handler.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt (added)
• LayoutTests/fast/events/pageshow-pagehide-on-back-cached-with-frames.html (added)
• LayoutTests/fast/events/resources/pageshow-pagehide-subframe-cachable.html (added)
• LayoutTests/fast/events/resources/pageshow-pagehide-subsubframe-cachable.html (added)
• LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt (added)
• LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html (added)
• LayoutTests/fast/loader/resources/notify-done.html (added)
• LayoutTests/fast/loader/resources/subframe-with-subsubframe-with-unload-handler.html (added)
• LayoutTests/fast/loader/resources/subframe-with-unload-handler.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-03  Brady Eidson  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        Page Cache should support pages with Frames.
+        https://bugs.webkit.org/show_bug.cgi?id=13631
+
+        * fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt: Added.
+        * fast/events/pageshow-pagehide-on-back-cached-with-frames.html: Added.
+        * fast/events/resources/pageshow-pagehide-subframe-cachable.html: Added.
+        * fast/events/resources/pageshow-pagehide-subsubframe-cachable.html: Added.
+        * fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt: Added.
+        * fast/loader/frames-with-unload-handlers-in-page-cache.html: Added.
+        * fast/loader/resources/notify-done.html: Added.
+        * fast/loader/resources/subframe-with-subsubframe-with-unload-handler.html: Added.
+        * fast/loader/resources/subframe-with-unload-handler.html: Added.
+
 2009-09-03  Steve VanDeBogart  <[email protected]>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-03  Brady Eidson  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        Page Cache should support pages with Frames.
+        https://bugs.webkit.org/show_bug.cgi?id=13631
+
+        Tests: fast/events/pageshow-pagehide-on-back-cached-with-frames.html
+               fast/loader/frames-with-unload-handlers-in-page-cache.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::canCachePageContainingThisFrame):
+        (WebCore::FrameLoader::logCanCacheFrameDecision):
+
 2009-09-03  Steve VanDeBogart  <[email protected]>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1819 +1819 @@
     return m_documentLoader
         && m_documentLoader->mainDocumentError().isNull()
-        && !m_frame->tree()->childCount()
         // FIXME: If we ever change this so that frames with plug-ins will be cached,
         // we need to make sure that we don't cache frames that have outstanding NPObjects
@@ -1968 +1967 @@
         if (!m_documentLoader->mainDocumentError().isNull())
             { PCLOG("   -Main document has an error"); cannotCache = true; }
-        if (m_frame->tree()->childCount())
-            { PCLOG("   -Frame has child frames"); cannotCache = true; }
         if (m_containsPlugIns)
             { PCLOG("   -Frame contains plugins"); cannotCache = true; }