Changeset 169026 in webkit

Timestamp:

May 18, 2014, 5:12:32 PM (12 years ago)

Author:

andersca@apple.com

Message:

Relax an assertion when creating document loaders
​https://bugs.webkit.org/show_bug.cgi?id=133058

Reviewed by Sam Weinig.

When navigating back/forward items recursively, createDocumentLoader will be called
for subframes before main frames so only associate the navigation with main frames.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::createDocumentLoader):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-18  Anders Carlsson  <andersca@apple.com>
+
+        Relax an assertion when creating document loaders
+        https://bugs.webkit.org/show_bug.cgi?id=133058
+
+        Reviewed by Sam Weinig.
+
+        When navigating back/forward items recursively, createDocumentLoader will be called
+        for subframes before main frames so only associate the navigation with main frames.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::createDocumentLoader):
+
 2014-05-18  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4533 +4533 @@
     RefPtr<WebDocumentLoader> documentLoader = WebDocumentLoader::create(request, substituteData);
 
-    if (m_pendingNavigationID) {
-        ASSERT_UNUSED(frame, frame.isMainFrame());
-
+    if (m_pendingNavigationID && frame.isMainFrame()) {
         documentLoader->setNavigationID(m_pendingNavigationID);
         m_pendingNavigationID = 0;