Title: [169061] branches/safari-538.34.5-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog (169060 => 169061)
--- branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-19 20:11:06 UTC (rev 169060)
+++ branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-19 20:12:13 UTC (rev 169061)
@@ -1,5 +1,22 @@
2014-05-19 Lucas Forschler <[email protected]>
+ Merge r169026
+
+ 2014-05-18 Anders Carlsson <[email protected]>
+
+ 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-19 Lucas Forschler <[email protected]>
+
Merge r169023
2014-05-18 Sam Weinig <[email protected]>
Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169060 => 169061)
--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-19 20:11:06 UTC (rev 169060)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-19 20:12:13 UTC (rev 169061)
@@ -4534,9 +4534,7 @@
{
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
