Diff
Modified: trunk/Source/WebKit/ChangeLog (238526 => 238527)
--- trunk/Source/WebKit/ChangeLog 2018-11-26 22:57:44 UTC (rev 238526)
+++ trunk/Source/WebKit/ChangeLog 2018-11-26 23:06:57 UTC (rev 238527)
@@ -1,3 +1,15 @@
+2018-11-26 Alex Christensen <[email protected]>
+
+ 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.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _safeBrowsingWarning]):
+ (-[WKWebView _safeBrowsingWarningForTesting]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
2018-11-26 Daniel Bates <[email protected]>
REGRESSION (r237738): Command Down Arrow doesn't scroll to the end of a page anymore
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (238526 => 238527)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-11-26 22:57:44 UTC (rev 238526)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-11-26 23:06:57 UTC (rev 238527)
@@ -4572,6 +4572,18 @@
_page->process().terminate();
}
+#if PLATFORM(MAC)
+- (NSView *)_safeBrowsingWarning
+{
+ return _impl->safeBrowsingWarning();
+}
+#else
+- (UIView *)_safeBrowsingWarning
+{
+ return _safeBrowsingWarning.get();
+}
+#endif
+
- (WKNavigation *)_reloadWithoutContentBlockers
{
return wrapper(_page->reload(WebCore::ReloadOption::DisableContentBlockers));
@@ -6847,18 +6859,6 @@
_resolutionForShareSheetImmediateCompletionForTesting = resolved;
}
-#if PLATFORM(MAC)
-- (NSView *)_safeBrowsingWarningForTesting
-{
- return _impl->safeBrowsingWarning();
-}
-#else
-- (UIView *)_safeBrowsingWarningForTesting
-{
- return _safeBrowsingWarning.get();
-}
-#endif
-
- (_WKInspector *)_inspector
{
if (auto* inspector = _page->inspector())
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (238526 => 238527)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2018-11-26 22:57:44 UTC (rev 238526)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2018-11-26 23:06:57 UTC (rev 238527)
@@ -284,7 +284,9 @@
- (void)_accessibilityRetrieveSpeakSelectionContent WK_API_AVAILABLE(ios(11.0));
- (void)_accessibilityDidGetSpeakSelectionContent:(NSString *)content WK_API_AVAILABLE(ios(11.0));
+@property (nonatomic, readonly) UIView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
#else
+@property (nonatomic, readonly) NSView *_safeBrowsingWarning WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, readonly) _WKRectEdge _pinnedState WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setRubberBandingEnabled:) _WKRectEdge _rubberBandingEnabled WK_API_AVAILABLE(macosx(10.13.4));
@@ -471,9 +473,7 @@
- (void)_accessibilityClearSelection WK_API_AVAILABLE(ios(11.3));
- (UIView *)_fullScreenPlaceholderView WK_API_AVAILABLE(ios(12.0));
-@property (nonatomic, readonly) UIView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
#else
-@property (nonatomic, readonly) NSView *_safeBrowsingWarningForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
- (void)_dismissContentRelativeChildWindows WK_API_AVAILABLE(macosx(10.13.4));
- (void)_setFrame:(NSRect)rect andScrollBy:(NSSize)offset WK_API_AVAILABLE(macosx(10.13.4));
- (void)_beginDeferringViewInWindowChanges WK_API_AVAILABLE(macosx(10.13.4));
Modified: trunk/Tools/ChangeLog (238526 => 238527)
--- trunk/Tools/ChangeLog 2018-11-26 22:57:44 UTC (rev 238526)
+++ trunk/Tools/ChangeLog 2018-11-26 23:06:57 UTC (rev 238527)
@@ -1,3 +1,14 @@
+2018-11-26 Alex Christensen <[email protected]>
+
+ 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.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
+ (TEST):
+ (safeBrowsingView):
+
2018-11-26 Daniel Bates <[email protected]>
REGRESSION (r237738): Command Down Arrow doesn't scroll to the end of a page anymore
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm (238526 => 238527)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm 2018-11-26 22:57:44 UTC (rev 238526)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm 2018-11-26 23:06:57 UTC (rev 238527)
@@ -157,13 +157,13 @@
[webView setNavigationDelegate:delegate.get()];
EXPECT_TRUE([webView configuration].preferences.safeBrowsingEnabled);
[webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
- while (![webView _safeBrowsingWarningForTesting])
+ while (![webView _safeBrowsingWarning])
TestWebKitAPI::Util::spinRunLoop();
[webView configuration].preferences.safeBrowsingEnabled = NO;
[webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple2")]];
TestWebKitAPI::Util::run(&done);
EXPECT_FALSE([webView configuration].preferences.safeBrowsingEnabled);
- EXPECT_FALSE([webView _safeBrowsingWarningForTesting]);
+ EXPECT_FALSE([webView _safeBrowsingWarning]);
}
static RetainPtr<WKWebView> safeBrowsingView()
@@ -174,10 +174,10 @@
auto webView = adoptNS([WKWebView new]);
[webView setNavigationDelegate:delegate.get()];
[webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
- while (![webView _safeBrowsingWarningForTesting])
+ while (![webView _safeBrowsingWarning])
TestWebKitAPI::Util::spinRunLoop();
#if !PLATFORM(MAC)
- [[webView _safeBrowsingWarningForTesting] didMoveToWindow];
+ [[webView _safeBrowsingWarning] didMoveToWindow];
#endif
return webView;
}
@@ -201,16 +201,16 @@
TEST(SafeBrowsing, GoBack)
{
auto webView = safeBrowsingView();
- auto warning = [webView _safeBrowsingWarningForTesting];
+ auto warning = [webView _safeBrowsingWarning];
auto box = warning.subviews.firstObject;
checkTitleAndClick(box.subviews[3], "Go Back");
- EXPECT_EQ([webView _safeBrowsingWarningForTesting], nil);
+ EXPECT_EQ([webView _safeBrowsingWarning], nil);
}
TEST(SafeBrowsing, VisitUnsafeWebsite)
{
auto webView = safeBrowsingView();
- auto warning = [webView _safeBrowsingWarningForTesting];
+ auto warning = [webView _safeBrowsingWarning];
EXPECT_EQ(warning.subviews.count, 1ull);
checkTitleAndClick(warning.subviews.firstObject.subviews[4], "Show Details");
EXPECT_EQ(warning.subviews.count, 2ull);
@@ -222,9 +222,9 @@
TEST(SafeBrowsing, NavigationClearsWarning)
{
auto webView = safeBrowsingView();
- EXPECT_NE([webView _safeBrowsingWarningForTesting], nil);
+ EXPECT_NE([webView _safeBrowsingWarning], nil);
[webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
- while ([webView _safeBrowsingWarningForTesting])
+ while ([webView _safeBrowsingWarning])
TestWebKitAPI::Util::spinRunLoop();
}
@@ -240,17 +240,17 @@
completionHandlerCalled = true;
}];
#if !PLATFORM(MAC)
- [[webView _safeBrowsingWarningForTesting] didMoveToWindow];
+ [[webView _safeBrowsingWarning] didMoveToWindow];
#endif
};
showWarning();
- checkTitleAndClick([webView _safeBrowsingWarningForTesting].subviews.firstObject.subviews[3], "Go Back");
+ checkTitleAndClick([webView _safeBrowsingWarning].subviews.firstObject.subviews[3], "Go Back");
TestWebKitAPI::Util::run(&completionHandlerCalled);
EXPECT_FALSE(shouldContinueValue);
showWarning();
- [[webView _safeBrowsingWarningForTesting] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]];
+ [[webView _safeBrowsingWarning] performSelector:NSSelectorFromString(@"clickedOnLink:") withObject:[WKWebView _visitUnsafeWebsiteSentinel]];
TestWebKitAPI::Util::run(&completionHandlerCalled);
EXPECT_TRUE(shouldContinueValue);
}
