Changeset 238527 in webkit
- Timestamp:
- Nov 26, 2018 3:06:57 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r238526 r238527 1 2018-11-26 Alex Christensen <achristensen@webkit.org> 2 3 Rename WKWebView._safeBrowsingWarningForTesting to _safeBrowsingWarning to use it for more than testing 4 https://bugs.webkit.org/show_bug.cgi?id=191981 5 6 Reviewed by Tim Horton. 7 8 * UIProcess/API/Cocoa/WKWebView.mm: 9 (-[WKWebView _safeBrowsingWarning]): 10 (-[WKWebView _safeBrowsingWarningForTesting]): Deleted. 11 * UIProcess/API/Cocoa/WKWebViewPrivate.h: 12 1 13 2018-11-26 Daniel Bates <dabates@apple.com> 2 14 -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
r238475 r238527 4573 4573 } 4574 4574 4575 #if PLATFORM(MAC) 4576 - (NSView *)_safeBrowsingWarning 4577 { 4578 return _impl->safeBrowsingWarning(); 4579 } 4580 #else 4581 - (UIView *)_safeBrowsingWarning 4582 { 4583 return _safeBrowsingWarning.get(); 4584 } 4585 #endif 4586 4575 4587 - (WKNavigation *)_reloadWithoutContentBlockers 4576 4588 { … … 6848 6860 } 6849 6861 6850 #if PLATFORM(MAC)6851 - (NSView *)_safeBrowsingWarningForTesting6852 {6853 return _impl->safeBrowsingWarning();6854 }6855 #else6856 - (UIView *)_safeBrowsingWarningForTesting6857 {6858 return _safeBrowsingWarning.get();6859 }6860 #endif6861 6862 6862 - (_WKInspector *)_inspector 6863 6863 { -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
r238471 r238527 285 285 - (void)_accessibilityDidGetSpeakSelectionContent:(NSString *)content WK_API_AVAILABLE(ios(11.0)); 286 286 287 @property (nonatomic, readonly) UIView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); 287 288 #else 289 @property (nonatomic, readonly) NSView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); 288 290 289 291 @property (nonatomic, readonly) _WKRectEdge _pinnedState WK_API_AVAILABLE(macosx(10.13.4)); … … 472 474 - (UIView *)_fullScreenPlaceholderView WK_API_AVAILABLE(ios(12.0)); 473 475 474 @property (nonatomic, readonly) UIView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));475 476 #else 476 @property (nonatomic, readonly) NSView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));477 477 - (void)_dismissContentRelativeChildWindows WK_API_AVAILABLE(macosx(10.13.4)); 478 478 - (void)_setFrame:(NSRect)rect andScrollBy:(NSSize)offset WK_API_AVAILABLE(macosx(10.13.4)); -
trunk/Tools/ChangeLog
r238526 r238527 1 2018-11-26 Alex Christensen <achristensen@webkit.org> 2 3 Rename WKWebView._safeBrowsingWarningForTesting to _safeBrowsingWarning to use it for more than testing 4 https://bugs.webkit.org/show_bug.cgi?id=191981 5 6 Reviewed by Tim Horton. 7 8 * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm: 9 (TEST): 10 (safeBrowsingView): 11 1 12 2018-11-26 Daniel Bates <dabates@apple.com> 2 13 -
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm
r238342 r238527 158 158 EXPECT_TRUE([webView configuration].preferences.safeBrowsingEnabled); 159 159 [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]]; 160 while (![webView _safeBrowsingWarning ForTesting])160 while (![webView _safeBrowsingWarning]) 161 161 TestWebKitAPI::Util::spinRunLoop(); 162 162 [webView configuration].preferences.safeBrowsingEnabled = NO; … … 164 164 TestWebKitAPI::Util::run(&done); 165 165 EXPECT_FALSE([webView configuration].preferences.safeBrowsingEnabled); 166 EXPECT_FALSE([webView _safeBrowsingWarning ForTesting]);166 EXPECT_FALSE([webView _safeBrowsingWarning]); 167 167 } 168 168 … … 175 175 [webView setNavigationDelegate:delegate.get()]; 176 176 [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]]; 177 while (![webView _safeBrowsingWarning ForTesting])177 while (![webView _safeBrowsingWarning]) 178 178 TestWebKitAPI::Util::spinRunLoop(); 179 179 #if !PLATFORM(MAC) 180 [[webView _safeBrowsingWarning ForTesting] didMoveToWindow];180 [[webView _safeBrowsingWarning] didMoveToWindow]; 181 181 #endif 182 182 return webView; … … 202 202 { 203 203 auto webView = safeBrowsingView(); 204 auto warning = [webView _safeBrowsingWarning ForTesting];204 auto warning = [webView _safeBrowsingWarning]; 205 205 auto box = warning.subviews.firstObject; 206 206 checkTitleAndClick(box.subviews[3], "Go Back"); 207 EXPECT_EQ([webView _safeBrowsingWarning ForTesting], nil);207 EXPECT_EQ([webView _safeBrowsingWarning], nil); 208 208 } 209 209 … … 211 211 { 212 212 auto webView = safeBrowsingView(); 213 auto warning = [webView _safeBrowsingWarning ForTesting];213 auto warning = [webView _safeBrowsingWarning]; 214 214 EXPECT_EQ(warning.subviews.count, 1ull); 215 215 checkTitleAndClick(warning.subviews.firstObject.subviews[4], "Show Details"); … … 223 223 { 224 224 auto webView = safeBrowsingView(); 225 EXPECT_NE([webView _safeBrowsingWarning ForTesting], nil);225 EXPECT_NE([webView _safeBrowsingWarning], nil); 226 226 [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]]; 227 while ([webView _safeBrowsingWarning ForTesting])227 while ([webView _safeBrowsingWarning]) 228 228 TestWebKitAPI::Util::spinRunLoop(); 229 229 } … … 241 241 }]; 242 242 #if !PLATFORM(MAC) 243 [[webView _safeBrowsingWarning ForTesting] didMoveToWindow];243 [[webView _safeBrowsingWarning] didMoveToWindow]; 244 244 #endif 245 245 }; 246 246 247 247 showWarning(); 248 checkTitleAndClick([webView _safeBrowsingWarning ForTesting].subviews.firstObject.subviews[3], "Go Back");248 checkTitleAndClick([webView _safeBrowsingWarning].subviews.firstObject.subviews[3], "Go Back"); 249 249 TestWebKitAPI::Util::run(&completionHandlerCalled); 250 250 EXPECT_FALSE(shouldContinueValue); 251 251 252 252 showWarning(); 253 [[webView _safeBrowsingWarning ForTesting] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]];253 [[webView _safeBrowsingWarning] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]]; 254 254 TestWebKitAPI::Util::run(&completionHandlerCalled); 255 255 EXPECT_TRUE(shouldContinueValue);
Note: See TracChangeset
for help on using the changeset viewer.