Title: [211274] branches/safari-603-branch/Source/WebKit/mac
- Revision
- 211274
- Author
- matthew_han...@apple.com
- Date
- 2017-01-27 00:02:30 -0800 (Fri, 27 Jan 2017)
Log Message
Merge r211243. rdar://problem/30149809
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (211273 => 211274)
--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-27 08:02:28 UTC (rev 211273)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-27 08:02:30 UTC (rev 211274)
@@ -1,3 +1,24 @@
+2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r211243. rdar://problem/30149809
+
+ 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-25 Dean Jackson <d...@apple.com>
Disable Variation fonts on this branch.
Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm (211273 => 211274)
--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-27 08:02:28 UTC (rev 211273)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-27 08:02:30 UTC (rev 211274)
@@ -9552,7 +9552,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
