Title: [187828] releases/WebKitGTK/webkit-2.8
- Revision
- 187828
- Author
- [email protected]
- Date
- 2015-08-04 02:20:34 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r186570 - Fix ASSERTION FAILED: !m_pendingNavigationID in WebPage::reload().
https://bugs.webkit.org/show_bug.cgi?id=146546
Patch by Hyungwook Lee <[email protected]> on 2015-07-08
Reviewed by Darin Adler.
We did't reset pendingNavigationID value when request url is empty.
Hence we need to ignore ASSERT check in this case.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::reload):
Tools:
* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (187827 => 187828)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-04 09:15:30 UTC (rev 187827)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-04 09:20:34 UTC (rev 187828)
@@ -1,3 +1,16 @@
+2015-07-08 Hyungwook Lee <[email protected]>
+
+ Fix ASSERTION FAILED: !m_pendingNavigationID in WebPage::reload().
+ https://bugs.webkit.org/show_bug.cgi?id=146546
+
+ Reviewed by Darin Adler.
+
+ We did't reset pendingNavigationID value when request url is empty.
+ Hence we need to ignore ASSERT check in this case.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::reload):
+
2015-07-08 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.8.4 release.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187827 => 187828)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 09:15:30 UTC (rev 187827)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 09:20:34 UTC (rev 187828)
@@ -1197,7 +1197,7 @@
{
SendStopResponsivenessTimer stopper(this);
- ASSERT(!m_pendingNavigationID);
+ ASSERT(!m_mainFrame->coreFrame()->loader().frameHasLoaded() || !m_pendingNavigationID);
m_pendingNavigationID = navigationID;
m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
Modified: releases/WebKitGTK/webkit-2.8/Tools/ChangeLog (187827 => 187828)
--- releases/WebKitGTK/webkit-2.8/Tools/ChangeLog 2015-08-04 09:15:30 UTC (rev 187827)
+++ releases/WebKitGTK/webkit-2.8/Tools/ChangeLog 2015-08-04 09:20:34 UTC (rev 187828)
@@ -1,3 +1,16 @@
+2015-07-08 Hyungwook Lee <[email protected]>
+
+ Fix ASSERTION FAILED: !m_pendingNavigationID in WebPage::reload().
+ https://bugs.webkit.org/show_bug.cgi?id=146546
+
+ Reviewed by Darin Adler.
+
+ We did't reset pendingNavigationID value when request url is empty.
+ Hence we need to ignore ASSERT check in this case.
+
+ * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+ (TestWebKitAPI::TEST):
+
2015-06-24 Zalan Bujtas <[email protected]>
Subpixel rendering: roundToDevicePixel() snaps to wrong value.
Modified: releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp (187827 => 187828)
--- releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp 2015-08-04 09:15:30 UTC (rev 187827)
+++ releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp 2015-08-04 09:20:34 UTC (rev 187828)
@@ -155,6 +155,26 @@
Util::run(&test1Done);
}
+TEST(WebKit2, PageReload)
+{
+ WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
+ PlatformWebView webView(context.get());
+
+ // Reload test before url loading.
+ WKPageReload(webView.page());
+ WKPageReload(webView.page());
+
+ WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
+ WKPageLoadURL(webView.page(), url.get());
+
+ // Reload test after url loading.
+ WKPageReload(webView.page());
+
+ WKRetainPtr<WKURLRef> activeUrl = adoptWK(WKPageCopyActiveURL(webView.page()));
+ ASSERT_NOT_NULL(activeUrl.get());
+ EXPECT_TRUE(WKURLIsEqual(activeUrl.get(), url.get()));
+}
+
} // namespace TestWebKitAPI
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
