Title: [211767] trunk/Source/WebKit2
Revision
211767
Author
simon.fra...@apple.com
Date
2017-02-06 18:19:57 -0800 (Mon, 06 Feb 2017)

Log Message

Remove assertion in WebViewImpl::performKeyEquivalent()

Reviewed by Wenson Hsieh.

The assertion ASSERT(event == [NSApp currentEvent]) fires when using certain key combinations
in MiniBrowser's location field (e.g. Option-Shift-Arrow to select). The assertion is not correct,
so remove it.

* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::performKeyEquivalent):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (211766 => 211767)


--- trunk/Source/WebKit2/ChangeLog	2017-02-07 02:19:54 UTC (rev 211766)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-07 02:19:57 UTC (rev 211767)
@@ -1,5 +1,18 @@
 2017-02-06  Simon Fraser  <simon.fra...@apple.com>
 
+        Remove assertion in WebViewImpl::performKeyEquivalent()
+
+        Reviewed by Wenson Hsieh.
+
+        The assertion ASSERT(event == [NSApp currentEvent]) fires when using certain key combinations
+        in MiniBrowser's location field (e.g. Option-Shift-Arrow to select). The assertion is not correct,
+        so remove it.
+
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::performKeyEquivalent):
+
+2017-02-06  Simon Fraser  <simon.fra...@apple.com>
+
         [iOS WK2] Keep the tiled scrolling indicator on-screen when pinching
         https://bugs.webkit.org/show_bug.cgi?id=167915
 

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (211766 => 211767)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2017-02-07 02:19:54 UTC (rev 211766)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2017-02-07 02:19:57 UTC (rev 211767)
@@ -4638,8 +4638,6 @@
         return [m_view _web_superPerformKeyEquivalent:event];
     }
 
-    ASSERT(event == [NSApp currentEvent]);
-
     disableComplexTextInputIfNecessary();
 
     // Pass key combos through WebCore if there is a key binding available for
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to