Title: [211243] trunk/Source/WebKit/mac
Revision
211243
Author
wenson_hs...@apple.com
Date
2017-01-26 17:01:30 -0800 (Thu, 26 Jan 2017)

Log Message

REGRESSION (r207483): Touch Bar: Lists and BIU Buttons Missing from Touch Bar in HTML Notes
https://bugs.webkit.org/show_bug.cgi?id=167472
<rdar://problem/30149809>

Reviewed by Beth Dakin.

Revision 207483 caused the touch bar to stop showing up in HTML Notes due to -updateTextTouchBar not
initializing the text touch bar and causing -makeTouchBar to return nil while processing a mouse click. The
purpose of bailing out of the update was to prevent the text touch bar from thrashing during a selection drag.
If the text touch bar doesn't exist yet, we don't have to worry about its appearance flickering from a different
previous state, so we should just allow the touch bar to update instead.

* WebView/WebView.mm:
(-[WebView updateTextTouchBar]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (211242 => 211243)


--- trunk/Source/WebKit/mac/ChangeLog	2017-01-27 00:57:36 UTC (rev 211242)
+++ trunk/Source/WebKit/mac/ChangeLog	2017-01-27 01:01:30 UTC (rev 211243)
@@ -1,3 +1,20 @@
+2017-01-26  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        REGRESSION (r207483): Touch Bar: Lists and BIU Buttons Missing from Touch Bar in HTML Notes
+        https://bugs.webkit.org/show_bug.cgi?id=167472
+        <rdar://problem/30149809>
+
+        Reviewed by Beth Dakin.
+
+        Revision 207483 caused the touch bar to stop showing up in HTML Notes due to -updateTextTouchBar not
+        initializing the text touch bar and causing -makeTouchBar to return nil while processing a mouse click. The
+        purpose of bailing out of the update was to prevent the text touch bar from thrashing during a selection drag.
+        If the text touch bar doesn't exist yet, we don't have to worry about its appearance flickering from a different
+        previous state, so we should just allow the touch bar to update instead.
+
+        * WebView/WebView.mm:
+        (-[WebView updateTextTouchBar]):
+
 2017-01-26  Per Arne Vollan  <pvol...@apple.com>
 
         Crash when setting custom scale factor.

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (211242 => 211243)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2017-01-27 00:57:36 UTC (rev 211242)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2017-01-27 01:01:30 UTC (rev 211243)
@@ -9548,7 +9548,8 @@
 
 - (void)updateTextTouchBar
 {
-    if (_private->_isDeferringTextTouchBarUpdates) {
+    BOOL touchBarsRequireInitialization = !_private->_richTextTouchBar || !_private->_plainTextTouchBar;
+    if (_private->_isDeferringTextTouchBarUpdates && !touchBarsRequireInitialization) {
         _private->_needsDeferredTextTouchBarUpdate = YES;
         return;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to