Changeset 158775 in webkit

Timestamp:

Nov 6, 2013 12:48:59 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Add -[WKBrowsingContextController unreachableURL]
​https://bugs.webkit.org/show_bug.cgi?id=123909

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKBrowsingContextController.h: Declared unreachableURL property.
• UIProcess/API/mac/WKBrowsingContextController.mm:

(-[WKBrowsingContextController unreachableURL]): Added.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::unreachableURL): Added.

• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.h (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.mm (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-06  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Add -[WKBrowsingContextController unreachableURL]
+        https://bugs.webkit.org/show_bug.cgi?id=123909
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKBrowsingContextController.h: Declared unreachableURL property.
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController unreachableURL]): Added.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::unreachableURL): Added.
+        * UIProcess/WebPageProxy.h:
+
 2013-11-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h

@@ -111 +111 @@
 @property(readonly) NSURL *activeURL;
 
-/* URL for a request that has been sent, but no response has been recieved yet. */
+/* URL for a request that has been sent, but no response has been received yet. */
 @property(readonly) NSURL *provisionalURL;
 
-/* URL for a request that has been recieved, and is now being used. */
+/* URL for a request that has been received, and is now being used. */
 @property(readonly) NSURL *committedURL;
+
+@property(readonly) NSURL *unreachableURL;
 
 @property(readonly) double estimatedProgress;

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -325 +325 @@
 }
 
+- (NSURL *)unreachableURL
+{
+    const String& unreachableURL = toImpl(_data->_pageRef.get())->unreachableURL();
+    if (!unreachableURL)
+        return nil;
+
+    return !unreachableURL ? nil : [NSURL URLWithString:unreachableURL];
+}
+
 - (double)estimatedProgress
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -875 +875 @@
 }
 
+String WebPageProxy::unreachableURL() const
+{
+    if (!m_mainFrame)
+        return String();
+
+    return m_mainFrame->unreachableURL();
+}
+
 bool WebPageProxy::canShowMIMEType(const String& mimeType) const
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -298 +298 @@
     String provisionalURL() const;
     String committedURL() const;
+    String unreachableURL() const;
 
     bool willHandleHorizontalScrollEvents() const;