Changeset 166623 in webkit

Timestamp:

Apr 1, 2014 4:37:58 PM (10 years ago)

Author:

andersca@apple.com

Message:

Rename -[WKWebView activeURL] to -[WKWebView URL]
​https://bugs.webkit.org/show_bug.cgi?id=131077

Reviewed by Tim Horton.

Keep -[WKWebView activeURL] as SPI until no clients depend on it.

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

(-[WKWebView URL]):
(-[WKWebView activeURL]):

• UIProcess/API/Cocoa/WKWebViewPrivate.h:
• 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) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-01  Anders Carlsson  <andersca@apple.com>
+
+        Rename -[WKWebView activeURL] to -[WKWebView URL]
+        https://bugs.webkit.org/show_bug.cgi?id=131077
+
+        Reviewed by Tim Horton.
+
+        Keep -[WKWebView activeURL] as SPI until no clients depend on it.
+
+        * UIProcess/API/Cocoa/WKWebView.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView URL]):
+        (-[WKWebView activeURL]):
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::willChangeActiveURL):
+        (WebKit::NavigationState::didChangeActiveURL):
+
 2014-04-01  Anders Carlsson  <andersca@apple.com>
 

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

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

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

@@ -266 +266 @@
 }
 
-- (NSURL *)activeURL
+- (NSURL *)URL
 {
     return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
@@ -1180 +1180 @@
 }
 
+// FIXME: Remove this once nobody uses it.
+- (NSURL *)activeURL
+{
+    return self.URL;
+}
+
 #else
 

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

@@ -100 +100 @@
 
 - (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler;
+
+// FIXME: Remove this once nobody uses it.
+@property (nonatomic, readonly) NSURL *activeURL;
+
 #else
 @property (readonly) NSColor *_pageExtendedBackgroundColor;

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

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