Title: [110834] trunk/Source/WebKit2
- Revision
- 110834
- Author
- carlo...@webkit.org
- Date
- 2012-03-15 02:08:57 -0700 (Thu, 15 Mar 2012)
Log Message
[WK2] WebPageProxy::activeURL should return unreachableURL() when it's not empty
https://bugs.webkit.org/show_bug.cgi?id=75465
Reviewed by Philippe Normand.
* UIProcess/API/gtk/tests/WebViewTest.cpp:
(WebViewTest::replaceContent): Return the main frame
unreachableURL if it's not empty.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::activeURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (110833 => 110834)
--- trunk/Source/WebKit2/ChangeLog 2012-03-15 08:57:19 UTC (rev 110833)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-15 09:08:57 UTC (rev 110834)
@@ -1,3 +1,16 @@
+2012-03-15 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [WK2] WebPageProxy::activeURL should return unreachableURL() when it's not empty
+ https://bugs.webkit.org/show_bug.cgi?id=75465
+
+ Reviewed by Philippe Normand.
+
+ * UIProcess/API/gtk/tests/WebViewTest.cpp:
+ (WebViewTest::replaceContent): Return the main frame
+ unreachableURL if it's not empty.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::activeURL):
+
2012-03-14 Anders Carlsson <ander...@apple.com>
java/java-and-plugins.html test failing
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp (110833 => 110834)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2012-03-15 08:57:19 UTC (rev 110833)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2012-03-15 09:08:57 UTC (rev 110834)
@@ -74,15 +74,7 @@
void WebViewTest::replaceContent(const char* html, const char* contentURI, const char* baseURI)
{
- // FIXME: The active uri should be the contentURI,
- // but WebPageProxy doesn't return the unreachableURL
- // when the page has been loaded with AlternateHTML()
- // See https://bugs.webkit.org/show_bug.cgi?id=75465.
-#if 0
m_activeURI = contentURI;
-#else
- m_activeURI = "about:blank";
-#endif
webkit_web_view_replace_content(m_webView, html, contentURI, baseURI);
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (110833 => 110834)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-15 08:57:19 UTC (rev 110833)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-15 09:08:57 UTC (rev 110834)
@@ -645,7 +645,8 @@
if (!m_pendingAPIRequestURL.isNull())
return m_pendingAPIRequestURL;
- // FIXME: What do we do in the case of the unreachable URL?
+ if (!m_mainFrame->unreachableURL().isEmpty())
+ return m_mainFrame->unreachableURL();
switch (m_mainFrame->loadState()) {
case WebFrameProxy::LoadStateProvisional:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
