Changeset 166623 in webkit
- Timestamp:
- Apr 1, 2014 4:37:58 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r166621 r166623 1 2014-04-01 Anders Carlsson <andersca@apple.com> 2 3 Rename -[WKWebView activeURL] to -[WKWebView URL] 4 https://bugs.webkit.org/show_bug.cgi?id=131077 5 6 Reviewed by Tim Horton. 7 8 Keep -[WKWebView activeURL] as SPI until no clients depend on it. 9 10 * UIProcess/API/Cocoa/WKWebView.h: 11 * UIProcess/API/Cocoa/WKWebView.mm: 12 (-[WKWebView URL]): 13 (-[WKWebView activeURL]): 14 * UIProcess/API/Cocoa/WKWebViewPrivate.h: 15 * UIProcess/Cocoa/NavigationState.mm: 16 (WebKit::NavigationState::willChangeActiveURL): 17 (WebKit::NavigationState::didChangeActiveURL): 18 1 19 2014-04-01 Anders Carlsson <andersca@apple.com> 2 20 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h
r166621 r166623 95 95 @discussion This is the URL that should be reflected in the user interface. 96 96 */ 97 @property (nonatomic, readonly) NSURL * activeURL;97 @property (nonatomic, readonly) NSURL *URL; 98 98 99 99 /*! @abstract Whether the view is loading content. @link WKWebView @/link is KVO-compliant for this -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r166621 r166623 266 266 } 267 267 268 - (NSURL *) activeURL268 - (NSURL *)URL 269 269 { 270 270 return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()]; … … 1180 1180 } 1181 1181 1182 // FIXME: Remove this once nobody uses it. 1183 - (NSURL *)activeURL 1184 { 1185 return self.URL; 1186 } 1187 1182 1188 #else 1183 1189 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
r166612 r166623 100 100 101 101 - (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler; 102 103 // FIXME: Remove this once nobody uses it. 104 @property (nonatomic, readonly) NSURL *activeURL; 105 102 106 #else 103 107 @property (readonly) NSColor *_pageExtendedBackgroundColor; -
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm
r166613 r166623 543 543 void NavigationState::willChangeActiveURL() 544 544 { 545 [m_webView willChangeValueForKey:@" activeURL"];545 [m_webView willChangeValueForKey:@"URL"]; 546 546 } 547 547 548 548 void NavigationState::didChangeActiveURL() 549 549 { 550 [m_webView didChangeValueForKey:@" activeURL"];550 [m_webView didChangeValueForKey:@"URL"]; 551 551 } 552 552
Note: See TracChangeset
for help on using the changeset viewer.