Changeset 238527 in webkit


Ignore:
Timestamp:
Nov 26, 2018 3:06:57 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Rename WKWebView._safeBrowsingWarningForTesting to _safeBrowsingWarning to use it for more than testing
https://bugs.webkit.org/show_bug.cgi?id=191981

Reviewed by Tim Horton.

Source/WebKit:

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _safeBrowsingWarning]):
(-[WKWebView _safeBrowsingWarningForTesting]): Deleted.

  • UIProcess/API/Cocoa/WKWebViewPrivate.h:

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:

(TEST):
(safeBrowsingView):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r238526 r238527  
     12018-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
    1132018-11-26  Daniel Bates  <dabates@apple.com>
    214
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

    r238475 r238527  
    45734573}
    45744574
     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
    45754587- (WKNavigation *)_reloadWithoutContentBlockers
    45764588{
     
    68486860}
    68496861
    6850 #if PLATFORM(MAC)
    6851 - (NSView *)_safeBrowsingWarningForTesting
    6852 {
    6853     return _impl->safeBrowsingWarning();
    6854 }
    6855 #else
    6856 - (UIView *)_safeBrowsingWarningForTesting
    6857 {
    6858     return _safeBrowsingWarning.get();
    6859 }
    6860 #endif
    6861 
    68626862- (_WKInspector *)_inspector
    68636863{
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r238471 r238527  
    285285- (void)_accessibilityDidGetSpeakSelectionContent:(NSString *)content WK_API_AVAILABLE(ios(11.0));
    286286
     287@property (nonatomic, readonly) UIView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    287288#else
     289@property (nonatomic, readonly) NSView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    288290
    289291@property (nonatomic, readonly) _WKRectEdge _pinnedState WK_API_AVAILABLE(macosx(10.13.4));
     
    472474- (UIView *)_fullScreenPlaceholderView WK_API_AVAILABLE(ios(12.0));
    473475
    474 @property (nonatomic, readonly) UIView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    475476#else
    476 @property (nonatomic, readonly) NSView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    477477- (void)_dismissContentRelativeChildWindows WK_API_AVAILABLE(macosx(10.13.4));
    478478- (void)_setFrame:(NSRect)rect andScrollBy:(NSSize)offset WK_API_AVAILABLE(macosx(10.13.4));
  • trunk/Tools/ChangeLog

    r238526 r238527  
     12018-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
    1122018-11-26  Daniel Bates  <dabates@apple.com>
    213
  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm

    r238342 r238527  
    158158    EXPECT_TRUE([webView configuration].preferences.safeBrowsingEnabled);
    159159    [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
    160     while (![webView _safeBrowsingWarningForTesting])
     160    while (![webView _safeBrowsingWarning])
    161161        TestWebKitAPI::Util::spinRunLoop();
    162162    [webView configuration].preferences.safeBrowsingEnabled = NO;
     
    164164    TestWebKitAPI::Util::run(&done);
    165165    EXPECT_FALSE([webView configuration].preferences.safeBrowsingEnabled);
    166     EXPECT_FALSE([webView _safeBrowsingWarningForTesting]);
     166    EXPECT_FALSE([webView _safeBrowsingWarning]);
    167167}
    168168
     
    175175    [webView setNavigationDelegate:delegate.get()];
    176176    [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
    177     while (![webView _safeBrowsingWarningForTesting])
     177    while (![webView _safeBrowsingWarning])
    178178        TestWebKitAPI::Util::spinRunLoop();
    179179#if !PLATFORM(MAC)
    180     [[webView _safeBrowsingWarningForTesting] didMoveToWindow];
     180    [[webView _safeBrowsingWarning] didMoveToWindow];
    181181#endif
    182182    return webView;
     
    202202{
    203203    auto webView = safeBrowsingView();
    204     auto warning = [webView _safeBrowsingWarningForTesting];
     204    auto warning = [webView _safeBrowsingWarning];
    205205    auto box = warning.subviews.firstObject;
    206206    checkTitleAndClick(box.subviews[3], "Go Back");
    207     EXPECT_EQ([webView _safeBrowsingWarningForTesting], nil);
     207    EXPECT_EQ([webView _safeBrowsingWarning], nil);
    208208}
    209209
     
    211211{
    212212    auto webView = safeBrowsingView();
    213     auto warning = [webView _safeBrowsingWarningForTesting];
     213    auto warning = [webView _safeBrowsingWarning];
    214214    EXPECT_EQ(warning.subviews.count, 1ull);
    215215    checkTitleAndClick(warning.subviews.firstObject.subviews[4], "Show Details");
     
    223223{
    224224    auto webView = safeBrowsingView();
    225     EXPECT_NE([webView _safeBrowsingWarningForTesting], nil);
     225    EXPECT_NE([webView _safeBrowsingWarning], nil);
    226226    [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
    227     while ([webView _safeBrowsingWarningForTesting])
     227    while ([webView _safeBrowsingWarning])
    228228        TestWebKitAPI::Util::spinRunLoop();
    229229}
     
    241241        }];
    242242#if !PLATFORM(MAC)
    243         [[webView _safeBrowsingWarningForTesting] didMoveToWindow];
     243        [[webView _safeBrowsingWarning] didMoveToWindow];
    244244#endif
    245245    };
    246246
    247247    showWarning();
    248     checkTitleAndClick([webView _safeBrowsingWarningForTesting].subviews.firstObject.subviews[3], "Go Back");
     248    checkTitleAndClick([webView _safeBrowsingWarning].subviews.firstObject.subviews[3], "Go Back");
    249249    TestWebKitAPI::Util::run(&completionHandlerCalled);
    250250    EXPECT_FALSE(shouldContinueValue);
    251251
    252252    showWarning();
    253     [[webView _safeBrowsingWarningForTesting] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]];
     253    [[webView _safeBrowsingWarning] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]];
    254254    TestWebKitAPI::Util::run(&completionHandlerCalled);
    255255    EXPECT_TRUE(shouldContinueValue);
Note: See TracChangeset for help on using the changeset viewer.