Changeset 44468 in webkit

Timestamp:

Jun 5, 2009 7:00:20 AM (15 years ago)

Author:

oliver@apple.com

Message:

2009-06-03 Ben Murdoch <​benm@google.com>

<​https://bugs.webkit.org/show_bug.cgi?id=25710> HTML5 Database stops executing transactions if the URL hash changes while a transaction is open and an XHR is in progress.

Reviewed by Alexey Proskuryakov.

Fix a bug that causes database transactions to fail if a history navigation to a hash fragment of the same document is made while resources (e.g. an XHR) are loading
​https://bugs.webkit.org/show_bug.cgi?id=25710

Test: storage/hash-change-with-xhr.html

• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::stopLoading):
• loader/DocumentLoader.h:
• loader/FrameLoader.cpp: (WebCore::FrameLoader::stopLoading): (WebCore::FrameLoader::stopAllLoaders):
• loader/FrameLoader.h:
• loader/FrameLoaderTypes.h: (WebCore::):
• page/Page.cpp: (WebCore::Page::goToItem):
• WebCore.base.exp:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/hash-change-with-xhr-expected.txt (added)
• LayoutTests/storage/hash-change-with-xhr.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• WebCore/loader/DocumentLoader.h (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (4 diffs)
• WebCore/loader/FrameLoader.h (modified) (2 diffs)
• WebCore/loader/FrameLoaderTypes.h (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-06-01  Ben Murdoch  <benm@google.com>
+
+        <https://bugs.webkit.org/show_bug.cgi?id=25710> HTML5 Database stops executing transactions if the URL hash changes while a transaction is open and an XHR is in progress.
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix a bug that causes database transactions to fail if a history
+        navigation to a hash fragment of the same document is made while
+        resources (e.g. an XHR) are loading.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25710
+
+        * storage/hash-change-with-xhr-expected.txt: Added.
+        * storage/hash-change-with-xhr.html: Added.
+
 2009-06-03  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-03  Ben Murdoch  <benm@google.com>
+
+        <https://bugs.webkit.org/show_bug.cgi?id=25710> HTML5 Database stops executing transactions if the URL hash changes while a transaction is open and an XHR is in progress.
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix a bug that causes database transactions to fail if a history navigation to a hash fragment of the same document is made while resources (e.g. an XHR) are loading
+
+        Test: storage/hash-change-with-xhr.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::stopLoading):
+        * loader/DocumentLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+        (WebCore::FrameLoader::stopAllLoaders):
+        * loader/FrameLoader.h:
+        * loader/FrameLoaderTypes.h:
+        (WebCore::):
+        * page/Page.cpp:
+        (WebCore::Page::goToItem):
+        * WebCore.base.exp:
+
 2009-06-03  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebCore/WebCore.base.exp

@@ -156 +156 @@
 __ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
 __ZN7WebCore11FrameLoader11setEncodingERKNS_6StringEb
-__ZN7WebCore11FrameLoader11stopLoadingEb
+__ZN7WebCore11FrameLoader11stopLoadingEbNS_14DatabasePolicyE
 __ZN7WebCore11FrameLoader12shouldReloadERKNS_4KURLES3_
 __ZN7WebCore11FrameLoader13executeScriptERKNS_6StringEb
 __ZN7WebCore11FrameLoader14detachChildrenEv
 __ZN7WebCore11FrameLoader14scrollToAnchorERKNS_4KURLE
-__ZN7WebCore11FrameLoader14stopAllLoadersEv
+__ZN7WebCore11FrameLoader14stopAllLoadersENS_14DatabasePolicyE
 __ZN7WebCore11FrameLoader16detachFromParentEv
 __ZN7WebCore11FrameLoader16loadFrameRequestERKNS_16FrameLoadRequestEbbN3WTF10PassRefPtrINS_5EventEEENS5_INS_9FormStateEEE

trunk/WebCore/loader/DocumentLoader.cpp

@@ -280 +280 @@
 // stopLoading will stop all loads initiated by the data source, 
 // but not loads initiated by child frames' data sources -- that's the WebFrame's job.
-void DocumentLoader::stopLoading()
+void DocumentLoader::stopLoading(DatabasePolicy databasePolicy)
 {
     // In some rare cases, calling FrameLoader::stopLoading could set m_loading to false.
@@ -293 +293 @@
         
         if (loading || doc->parsing())
-            m_frame->loader()->stopLoading(false);
+            m_frame->loader()->stopLoading(false, databasePolicy);
     }
 

trunk/WebCore/loader/DocumentLoader.h

@@ -94 +94 @@
         void replaceRequestURLForAnchorScroll(const KURL&);
         bool isStopping() const { return m_isStopping; }
-        void stopLoading();
+        void stopLoading(DatabasePolicy = DatabasePolicyStop);
         void setCommitted(bool committed) { m_committed = committed; }
         bool isCommitted() const { return m_committed; }

trunk/WebCore/loader/FrameLoader.cpp

@@ -604 +604 @@
 }
 
-void FrameLoader::stopLoading(bool sendUnload)
+void FrameLoader::stopLoading(bool sendUnload, DatabasePolicy databasePolicy)
 {
     if (m_frame->document() && m_frame->document()->tokenizer())
@@ -646 +646 @@
 
 #if ENABLE(DATABASE)
-        doc->stopDatabases();
+        if (databasePolicy == DatabasePolicyStop)
+            doc->stopDatabases();
 #endif
     }
@@ -2658 +2659 @@
 }
 
-void FrameLoader::stopAllLoaders()
+void FrameLoader::stopAllLoaders(DatabasePolicy databasePolicy)
 {
     if (m_unloadEventBeingDispatched)
@@ -2673 +2674 @@
     stopLoadingSubframes();
     if (m_provisionalDocumentLoader)
-        m_provisionalDocumentLoader->stopLoading();
+        m_provisionalDocumentLoader->stopLoading(databasePolicy);
     if (m_documentLoader)
-        m_documentLoader->stopLoading();
+        m_documentLoader->stopLoading(databasePolicy);
 
     setProvisionalDocumentLoader(0);

trunk/WebCore/loader/FrameLoader.h

@@ -156 +156 @@
 
         // Also not cool.
-        void stopAllLoaders();
+        void stopAllLoaders(DatabasePolicy = DatabasePolicyStop);
         void stopForUserCancel(bool deferCheckLoadComplete = false);
 
@@ -265 +265 @@
 
         void stop();
-        void stopLoading(bool sendUnload);
+        void stopLoading(bool sendUnload, DatabasePolicy = DatabasePolicyStop);
         bool closeURL();
 

trunk/WebCore/loader/FrameLoaderTypes.h

@@ -67 +67 @@
     };
 
+    enum DatabasePolicy {
+        DatabasePolicyStop,    // The database thread should be stopped and database connections closed.
+        DatabasePolicyContinue
+    };
+
     enum ObjectContentType {
         ObjectContentNone,

trunk/WebCore/page/Page.cpp

@@ -202 +202 @@
 {
     // Abort any current load if we're going to a history item
-    m_mainFrame->loader()->stopAllLoaders();
+
+    // Define what to do with any open database connections. By default we stop them and terminate the database thread.
+    DatabasePolicy databasePolicy = DatabasePolicyStop;
+
+#if ENABLE(DATABASE)
+    // If we're navigating the history via a fragment on the same document, then we do not want to stop databases.
+    const KURL& currentURL = m_mainFrame->loader()->url();
+    const KURL& newURL = item->url();
+
+    if (newURL.hasRef() && equalIgnoringRef(currentURL, newURL))
+        databasePolicy = DatabasePolicyContinue;
+#endif
+    m_mainFrame->loader()->stopAllLoaders(databasePolicy);
     m_mainFrame->loader()->goToItem(item, type);
 }