Title: [228872] branches/safari-605-branch/Tools
- Revision
- 228872
- Author
- [email protected]
- Date
- 2018-02-21 08:18:50 -0800 (Wed, 21 Feb 2018)
Log Message
Cherry-pick r228859. rdar://problem/37734496
Modified Paths
Diff
Modified: branches/safari-605-branch/Tools/ChangeLog (228871 => 228872)
--- branches/safari-605-branch/Tools/ChangeLog 2018-02-21 16:18:46 UTC (rev 228871)
+++ branches/safari-605-branch/Tools/ChangeLog 2018-02-21 16:18:50 UTC (rev 228872)
@@ -1,5 +1,16 @@
2018-02-21 Jason Marcell <[email protected]>
+ Cherry-pick r228859. rdar://problem/37734496
+
+ 2018-02-20 Timothy Horton <[email protected]>
+
+ Try to fix the 32-bit build after r228857
+
+ * WebKitTestRunner/mac/UIScriptControllerMac.mm:
+ (WTR::UIScriptController::firstResponderSuppressionForWebView):
+
+2018-02-21 Jason Marcell <[email protected]>
+
Cherry-pick r228857. rdar://problem/37734496
2018-02-20 Nan Wang <[email protected]>
Modified: branches/safari-605-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm (228871 => 228872)
--- branches/safari-605-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2018-02-21 16:18:46 UTC (rev 228871)
+++ branches/safari-605-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2018-02-21 16:18:50 UTC (rev 228872)
@@ -241,8 +241,12 @@
void UIScriptController::firstResponderSuppressionForWebView(bool shouldSuppress)
{
+#if WK_API_ENABLED
auto* webView = TestController::singleton().mainWebView()->platformView();
[webView _setShouldSuppressFirstResponderChanges:shouldSuppress];
+#else
+ UNUSED_PARAM(shouldSuppress);
+#endif
}
void UIScriptController::makeWindowContentViewFirstResponder()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes