Reviewed by Hyatt.

        <rdar://problem/5193517> FrameLoader::canCachePage() might walk the entire DOM
        http://bugs.webkit.org/show_bug.cgi?id=13662

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::provisionalLoadStarted): Remove some useless and now harmful
        code - there's no need to clear in this case.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90fae68..02177af 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-11  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Hyatt.
+
+        <rdar://problem/5193517> FrameLoader::canCachePage() might walk the entire DOM
+        http://bugs.webkit.org/show_bug.cgi?id=13662
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::provisionalLoadStarted): Remove some useless and now harmful
+        code - there's no need to clear in this case.
+
 2007-05-11  Oliver Hunt  <oliver@apple.com>
 
         GDK Build fix

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 68adcc4..ea3fcd3 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1551,16 +1551,9 @@ void FrameLoader::provisionalLoadStarted()
     cancelRedirection(true);
     m_client->provisionalLoadStarted();
 
-    if (canCachePage()) {
-        if (m_client->canCachePage()) {
-            if (!m_currentHistoryItem->cachedPage()) {
-                cachePageToHistoryItem(m_currentHistoryItem.get());
-                purgePageCache();
-            }
-        } else {
-            // Put the document into a null state, so it can be restored correctly. 
-            clear();
-        }
+    if (canCachePage() && m_client->canCachePage() && !m_currentHistoryItem->cachedPage()) {
+        cachePageToHistoryItem(m_currentHistoryItem.get());
+        purgePageCache();
     }
 }