[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[beidson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9e48ddbca275919bee2b5d73fd09984fa310feb0
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 16:43:39 2009 +0000

    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:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50153 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 710c81e..cebf518 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-27  Brady Eidson  <beidson at 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 at igalia.com>
 
         Another typo.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index b7da5e7..8041915 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -87,10 +87,6 @@ media/video-controls-zoomed.html
 # This test requires media controls has a volume slider.
 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
 
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 30614f8..7b1fb3b 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -637,10 +637,6 @@ media/video-controls-zoomed.html
 # Mixed content tests failing on Windows <http://webkit.org/b/29213>
 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
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 66bc1c0..6eefd8a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-27  Brady Eidson  <beidson at 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 at apple.com>
 
         Remove more empty files that didn't get removed earlier.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index cf21602..5dbc237 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -113,10 +113,6 @@
 #include "SVGViewSpec.h"
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
-#define PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS
-#endif
-
 namespace WebCore {
 
 #if ENABLE(SVG)
@@ -1468,9 +1464,7 @@ bool FrameLoader::canCachePageContainingThisFrame()
         // the right NPObjects. See <rdar://problem/5197041> for more information.
         && !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()
 #endif
@@ -1615,10 +1609,8 @@ bool FrameLoader::logCanCacheFrameDecision(int indentLevel)
             { PCLOG("   -Frame contains plugins"); cannotCache = true; }
         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())
             { PCLOG("   -Frame has open database handles"); cannotCache = true; }

-- 
WebKit Debian packaging