Title: [163358] trunk/Source/WebKit2
- Revision
- 163358
- Author
- [email protected]
- Date
- 2014-02-03 19:10:15 -0800 (Mon, 03 Feb 2014)
Log Message
Add title and hasOnlySecureContent properties to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=128152
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView title]):
(-[WKWebView hasOnlySecureContent]):
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::didChangeIsLoading):
(WebKit::NavigationState::willChangeTitle):
(WebKit::NavigationState::didChangeTitle):
(WebKit::NavigationState::willChangeHasOnlySecureContent):
(WebKit::NavigationState::didChangeHasOnlySecureContent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163357 => 163358)
--- trunk/Source/WebKit2/ChangeLog 2014-02-04 03:04:22 UTC (rev 163357)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-04 03:10:15 UTC (rev 163358)
@@ -1,3 +1,21 @@
+2014-02-03 Anders Carlsson <[email protected]>
+
+ Add title and hasOnlySecureContent properties to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=128152
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView title]):
+ (-[WKWebView hasOnlySecureContent]):
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::didChangeIsLoading):
+ (WebKit::NavigationState::willChangeTitle):
+ (WebKit::NavigationState::didChangeTitle):
+ (WebKit::NavigationState::willChangeHasOnlySecureContent):
+ (WebKit::NavigationState::didChangeHasOnlySecureContent):
+
2014-02-03 Sam Weinig <[email protected]>
Fix spelling.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (163357 => 163358)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-04 03:04:22 UTC (rev 163357)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-04 03:10:15 UTC (rev 163358)
@@ -73,10 +73,14 @@
- (WKNavigation *)loadRequest:(NSURLRequest *)request;
+@property (nonatomic, readonly) NSString *title;
+
/*! @abstract Whether the view is loading content. @link WKWebView @/link is KVO-compliant for this
property. */
@property (nonatomic, readonly, getter=isLoading) BOOL loading;
+@property (nonatomic, readonly) BOOL hasOnlySecureContent;
+
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163357 => 163358)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-04 03:04:22 UTC (rev 163357)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-04 03:10:15 UTC (rev 163358)
@@ -140,11 +140,21 @@
return [navigation.leakRef() autorelease];
}
+- (NSString *)title
+{
+ return _page->pageLoadState().title();
+}
+
- (BOOL)isLoading
{
return _page->pageLoadState().isLoading();
}
+- (BOOL)hasOnlySecureContent
+{
+ return _page->pageLoadState().hasOnlySecureContent();
+}
+
#pragma mark iOS-specific methods
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163357 => 163358)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-04 03:04:22 UTC (rev 163357)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-04 03:10:15 UTC (rev 163358)
@@ -310,15 +310,17 @@
void NavigationState::didChangeIsLoading()
{
- [m_webView willChangeValueForKey:@"loading"];
+ [m_webView didChangeValueForKey:@"loading"];
}
void NavigationState::willChangeTitle()
{
+ [m_webView willChangeValueForKey:@"title"];
}
void NavigationState::didChangeTitle()
{
+ [m_webView didChangeValueForKey:@"title"];
}
void NavigationState::willChangeActiveURL()
@@ -331,10 +333,12 @@
void NavigationState::willChangeHasOnlySecureContent()
{
+ [m_webView willChangeValueForKey:@"hasOnlySecureContent"];
}
void NavigationState::didChangeHasOnlySecureContent()
{
+ [m_webView didChangeValueForKey:@"hasOnlySecureContent"];
}
void NavigationState::willChangeEstimatedProgress()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
