Changeset 164079 in webkit

Timestamp:

Feb 13, 2014 5:24:09 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add -[WKWebView activeURL]
​https://bugs.webkit.org/show_bug.cgi?id=128777

Reviewed by Dan Bernstein.

• UIProcess/API/Cocoa/WKWebView.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView activeURL]):

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::willChangeActiveURL):
(WebKit::NavigationState::didChangeActiveURL):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (3 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-13  Anders Carlsson  <andersca@apple.com>
+
+        Add -[WKWebView activeURL]
+        https://bugs.webkit.org/show_bug.cgi?id=128777
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/Cocoa/WKWebView.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView activeURL]):
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::willChangeActiveURL):
+        (WebKit::NavigationState::didChangeActiveURL):
+
 2014-02-13  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

@@ -89 +89 @@
 @property (nonatomic, readonly) NSString *title;
 
+/*! @abstract The active URL. @link WKWebView @/link is KVO-compliant for this property.
+ @discussion This is the URL that should be reflected in the user interface.
+ */
+@property (nonatomic, readonly) NSURL *activeURL;
+
 /*! @abstract Whether the view is loading content. @link WKWebView @/link is KVO-compliant for this
  property. */

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -30 +30 @@
 
 #import "NavigationState.h"
+#import "RemoteLayerTreeTransaction.h"
 #import "RemoteObjectRegistry.h"
 #import "RemoteObjectRegistryMessages.h"
@@ -44 +45 @@
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
-#import <WebKit2/RemoteLayerTreeTransaction.h>
+#import "WKNSURLExtras.h"
 #import <wtf/RetainPtr.h>
 
@@ -192 +193 @@
 }
 
+- (NSURL *)activeURL
+{
+    return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
+}
+
 - (BOOL)isLoading
 {

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -395 +395 @@
 void NavigationState::willChangeActiveURL()
 {
+    [m_webView willChangeValueForKey:@"activeURL"];
 }
 
 void NavigationState::didChangeActiveURL()
 {
+    [m_webView didChangeValueForKey:@"activeURL"];
 }