Title: [164079] trunk/Source/WebKit2
- Revision
- 164079
- Author
- [email protected]
- Date
- 2014-02-13 17:24:09 -0800 (Thu, 13 Feb 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164078 => 164079)
--- trunk/Source/WebKit2/ChangeLog 2014-02-14 01:17:14 UTC (rev 164078)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-14 01:24:09 UTC (rev 164079)
@@ -1,5 +1,19 @@
2014-02-13 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Add -[WKWebView goToBackForwardListItem:]
https://bugs.webkit.org/show_bug.cgi?id=128773
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (164078 => 164079)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-14 01:17:14 UTC (rev 164078)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-14 01:24:09 UTC (rev 164079)
@@ -88,6 +88,11 @@
@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. */
@property (nonatomic, readonly, getter=isLoading) BOOL loading;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164078 => 164079)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-14 01:17:14 UTC (rev 164078)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-14 01:24:09 UTC (rev 164079)
@@ -29,6 +29,7 @@
#if WK_API_ENABLED
#import "NavigationState.h"
+#import "RemoteLayerTreeTransaction.h"
#import "RemoteObjectRegistry.h"
#import "RemoteObjectRegistryMessages.h"
#import "WKBackForwardListInternal.h"
@@ -43,7 +44,7 @@
#import "WebBackForwardList.h"
#import "WebPageProxy.h"
#import "WebProcessProxy.h"
-#import <WebKit2/RemoteLayerTreeTransaction.h>
+#import "WKNSURLExtras.h"
#import <wtf/RetainPtr.h>
#if PLATFORM(IOS)
@@ -191,6 +192,11 @@
return _page->pageLoadState().title();
}
+- (NSURL *)activeURL
+{
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
+}
+
- (BOOL)isLoading
{
return _page->pageLoadState().isLoading();
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (164078 => 164079)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-14 01:17:14 UTC (rev 164078)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-14 01:24:09 UTC (rev 164079)
@@ -394,10 +394,12 @@
void NavigationState::willChangeActiveURL()
{
+ [m_webView willChangeValueForKey:@"activeURL"];
}
void NavigationState::didChangeActiveURL()
{
+ [m_webView didChangeValueForKey:@"activeURL"];
}
void NavigationState::willChangeHasOnlySecureContent()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
