Title: [169026] trunk/Source/WebKit2
- Revision
- 169026
- Author
- [email protected]
- Date
- 2014-05-18 17:12:32 -0700 (Sun, 18 May 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169025 => 169026)
--- trunk/Source/WebKit2/ChangeLog 2014-05-18 23:30:47 UTC (rev 169025)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-19 00:12:32 UTC (rev 169026)
@@ -1,3 +1,16 @@
+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-18 Zsolt Borbely <[email protected]>
CMake Buildfix after r169023.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169025 => 169026)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-18 23:30:47 UTC (rev 169025)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-19 00:12:32 UTC (rev 169026)
@@ -4532,9 +4532,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
