Changeset 50153 in webkit

Timestamp:

Oct 27, 2009, 9:43:39 AM (17 years ago)

Author:

beidson@apple.com

Message:

Rubberstamped by Sam Weinig.

Re-enable the check that disallows pages with unload handlers in the page cache.

<rdar://problem/7196485> and ​http://webkit.org/b/29021

WebCore:

• loader/FrameLoader.cpp:

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

LayoutTests:

• platform/mac/Skipped:
• platform/win/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-27  Brady Eidson  <beidson@apple.com>
+
+        Rubberstamped by Sam Weinig.
+
+        Re-enable the check that disallows pages with unload handlers in the page cache.
+
+        <rdar://problem/7196485> and http://webkit.org/b/29021 
+
+        * platform/mac/Skipped:
+        * platform/win/Skipped:
+
 2009-10-27  Xan Lopez  <xlopez@igalia.com>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -88 +88 @@
 media/video-volume-slider.html
 
-# As long as pages with unload handlers are put in the Page Cache, this test doesn't make any sense for Mac.
-# <rdar://problem/7196485> and https://bugs.webkit.org/show_bug.cgi?id=29021
-fast/loader/frames-with-unload-handlers-in-page-cache.html
-
 # This port doesn't support detecting slow unload handlers.
 fast/dom/Window/slow_unload_handler.html

trunk/LayoutTests/platform/win/Skipped

@@ -638 +638 @@
 http/tests/security/mixedContent
 
-# As long as pages with unload handlers are put in the Page Cache, this test doesn't make any sense for Windows.
-# <rdar://problem/7196485> and https://bugs.webkit.org/show_bug.cgi?id=29021
-fast/loader/frames-with-unload-handlers-in-page-cache.html
-
 # <https://bugs.webkit.org/show_bug.cgi?id=29057>
 editing/pasteboard/files-during-page-drags.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-27  Brady Eidson  <beidson@apple.com>
+
+        Rubberstamped by Sam Weinig.
+
+        Re-enable the check that disallows pages with unload handlers in the page cache.
+
+        <rdar://problem/7196485> and http://webkit.org/b/29021 
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::canCachePageContainingThisFrame):
+        (WebCore::FrameLoader::logCanCacheFrameDecision):
+
 2009-10-27  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -114 +114 @@
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
-#define PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS
-#endif
-
 namespace WebCore {
 
@@ -1469 +1465 @@
         && !m_containsPlugIns
         && !m_URL.protocolIs("https")
-#ifndef PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS
         && (!m_frame->domWindow() || !m_frame->domWindow()->hasEventListeners(eventNames().unloadEvent))
-#endif
 #if ENABLE(DATABASE)
         && !m_frame->document()->hasOpenDatabases()
@@ -1616 +1610 @@
         if (m_URL.protocolIs("https"))
             { PCLOG("   -Frame is HTTPS"); cannotCache = true; }
-#ifndef PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS
         if (m_frame->domWindow() && m_frame->domWindow()->hasEventListeners(eventNames().unloadEvent))
             { PCLOG("   -Frame has an unload event listener"); cannotCache = true; }
-#endif
 #if ENABLE(DATABASE)
         if (m_frame->document()->hasOpenDatabases())