Changeset 110834 in webkit

Timestamp:

Mar 15, 2012 2:08:57 AM (12 years ago)

Author:

Carlos Garcia Campos

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/WebViewTest.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-15  Carlos Garcia Campos  <cgarcia@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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp

@@ -75 +75 @@
 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);
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -646 +646 @@
         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()) {