Changeset 163358 in webkit
- Timestamp:
- Feb 3, 2014 7:10:15 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r163355 r163358 1 2014-02-03 Anders Carlsson <andersca@apple.com> 2 3 Add title and hasOnlySecureContent properties to WKWebView 4 https://bugs.webkit.org/show_bug.cgi?id=128152 5 6 Reviewed by Dan Bernstein. 7 8 * UIProcess/API/Cocoa/WKWebView.h: 9 * UIProcess/API/Cocoa/WKWebView.mm: 10 (-[WKWebView title]): 11 (-[WKWebView hasOnlySecureContent]): 12 * UIProcess/Cocoa/NavigationState.mm: 13 (WebKit::NavigationState::didChangeIsLoading): 14 (WebKit::NavigationState::willChangeTitle): 15 (WebKit::NavigationState::didChangeTitle): 16 (WebKit::NavigationState::willChangeHasOnlySecureContent): 17 (WebKit::NavigationState::didChangeHasOnlySecureContent): 18 1 19 2014-02-03 Sam Weinig <sam@webkit.org> 2 20 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h
r163350 r163358 74 74 - (WKNavigation *)loadRequest:(NSURLRequest *)request; 75 75 76 @property (nonatomic, readonly) NSString *title; 77 76 78 /*! @abstract Whether the view is loading content. @link WKWebView @/link is KVO-compliant for this 77 79 property. */ 78 80 @property (nonatomic, readonly, getter=isLoading) BOOL loading; 79 81 82 @property (nonatomic, readonly) BOOL hasOnlySecureContent; 83 80 84 @end 81 85 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r163350 r163358 141 141 } 142 142 143 - (NSString *)title 144 { 145 return _page->pageLoadState().title(); 146 } 147 143 148 - (BOOL)isLoading 144 149 { 145 150 return _page->pageLoadState().isLoading(); 151 } 152 153 - (BOOL)hasOnlySecureContent 154 { 155 return _page->pageLoadState().hasOnlySecureContent(); 146 156 } 147 157 -
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm
r163350 r163358 311 311 void NavigationState::didChangeIsLoading() 312 312 { 313 [m_webView willChangeValueForKey:@"loading"];313 [m_webView didChangeValueForKey:@"loading"]; 314 314 } 315 315 316 316 void NavigationState::willChangeTitle() 317 317 { 318 [m_webView willChangeValueForKey:@"title"]; 318 319 } 319 320 320 321 void NavigationState::didChangeTitle() 321 322 { 323 [m_webView didChangeValueForKey:@"title"]; 322 324 } 323 325 … … 332 334 void NavigationState::willChangeHasOnlySecureContent() 333 335 { 336 [m_webView willChangeValueForKey:@"hasOnlySecureContent"]; 334 337 } 335 338 336 339 void NavigationState::didChangeHasOnlySecureContent() 337 340 { 341 [m_webView didChangeValueForKey:@"hasOnlySecureContent"]; 338 342 } 339 343
Note: See TracChangeset
for help on using the changeset viewer.