[webkit-changes] [208623] trunk/Source

Fri, 11 Nov 2016 16:06:07 -0800

Title: [208623] trunk/Source
Revision
208623
Author
bda...@apple.com
Date
2016-11-11 16:06:40 -0800 (Fri, 11 Nov 2016)

Log Message

Move to modern TouchBar methods
https://bugs.webkit.org/show_bug.cgi?id=164655
-and corresponding-
rdar://problem/29226911

Reviewed by Wenson Hsieh.

customizationDefaultItemIdentifiers -> defaultItemIdentifiers
itemIdentifiers -> defaultItemIdentifiers
defaultItems -> templateItems

Source/WebKit/mac:

* WebView/WebView.mm:
(-[WebView _plainTextTouchBarDefaultItemIdentifiers]):
(-[WebView _richTextTouchBarDefaultItemIdentifiers]):
(-[WebView setUpTextTouchBar:]):
(-[WebView updateTextTouchBar]):
(-[WebView _plainTextTouchBarCustomizationDefaultItemIdentifiers]): Deleted.
(-[WebView _richTextTouchBarCustomizationDefaultItemIdentifiers]): Deleted.

Source/WebKit2:

* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::plainTextTouchBarDefaultItemIdentifiers):
(WebKit::richTextTouchBarDefaultItemIdentifiers):
(WebKit::WebViewImpl::setUpTextTouchBar):
(WebKit::WebViewImpl::updateTextTouchBar):
(WebKit::plainTextTouchBarCustomizationDefaultItemIdentifiers): Deleted.
(WebKit::richTextTouchBarCustomizationDefaultItemIdentifiers): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (208622 => 208623)


--- trunk/Source/WebKit/mac/ChangeLog	2016-11-11 23:50:30 UTC (rev 208622)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-11-12 00:06:40 UTC (rev 208623)
@@ -1,3 +1,24 @@
+2016-11-11  Beth Dakin  <bda...@apple.com>
+
+        Move to modern TouchBar methods
+        https://bugs.webkit.org/show_bug.cgi?id=164655
+        -and corresponding-
+        rdar://problem/29226911
+
+        Reviewed by Wenson Hsieh.
+
+        customizationDefaultItemIdentifiers -> defaultItemIdentifiers
+        itemIdentifiers -> defaultItemIdentifiers
+        defaultItems -> templateItems
+
+        * WebView/WebView.mm:
+        (-[WebView _plainTextTouchBarDefaultItemIdentifiers]):
+        (-[WebView _richTextTouchBarDefaultItemIdentifiers]):
+        (-[WebView setUpTextTouchBar:]):
+        (-[WebView updateTextTouchBar]):
+        (-[WebView _plainTextTouchBarCustomizationDefaultItemIdentifiers]): Deleted.
+        (-[WebView _richTextTouchBarCustomizationDefaultItemIdentifiers]): Deleted.
+
 2016-11-11  Darin Adler  <da...@apple.com>
 
         Move Node from ExceptionCode to ExceptionOr

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208622 => 208623)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2016-11-11 23:50:30 UTC (rev 208622)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2016-11-12 00:06:40 UTC (rev 208623)
@@ -9296,12 +9296,12 @@
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextColorPicker, NSTouchBarItemIdentifierTextStyle, NSTouchBarItemIdentifierTextAlignment, NSTouchBarItemIdentifierTextList, NSTouchBarItemIdentifierFlexibleSpace ];
 }
 
-- (NSArray<NSString *> *)_plainTextTouchBarCustomizationDefaultItemIdentifiers
+- (NSArray<NSString *> *)_plainTextTouchBarDefaultItemIdentifiers
 {
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierCandidateList ];
 }
 
-- (NSArray<NSString *> *)_richTextTouchBarCustomizationDefaultItemIdentifiers
+- (NSArray<NSString *> *)_richTextTouchBarDefaultItemIdentifiers
 {
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextFormat, NSTouchBarItemIdentifierCandidateList ];
 }
@@ -9332,11 +9332,11 @@
 {
     BOOL isRichTextTouchBar = textTouchBar == _private->_richTextTouchBar;
     [textTouchBar setDelegate:self];
-    [textTouchBar setDefaultItems:[NSMutableSet setWithObject:isRichTextTouchBar ? _private->_richTextCandidateListTouchBarItem.get() : _private->_plainTextCandidateListTouchBarItem.get()]];
+    [textTouchBar setTemplateItems:[NSMutableSet setWithObject:isRichTextTouchBar ? _private->_richTextCandidateListTouchBarItem.get() : _private->_plainTextCandidateListTouchBarItem.get()]];
     [textTouchBar setCustomizationAllowedItemIdentifiers:[self _textTouchBarCustomizationAllowedIdentifiers]];
 
-    NSArray<NSString *> *defaultIdentifiers = isRichTextTouchBar ? [self _richTextTouchBarCustomizationDefaultItemIdentifiers] : [self _plainTextTouchBarCustomizationDefaultItemIdentifiers];
-    [textTouchBar setCustomizationDefaultItemIdentifiers:defaultIdentifiers];
+    NSArray<NSString *> *defaultIdentifiers = isRichTextTouchBar ? [self _richTextTouchBarDefaultItemIdentifiers] : [self _plainTextTouchBarDefaultItemIdentifiers];
+    [textTouchBar setDefaultItemIdentifiers:defaultIdentifiers];
 
     if (NSGroupTouchBarItem *textFormatItem = (NSGroupTouchBarItem *)[textTouchBar itemForIdentifier:NSTouchBarItemIdentifierTextFormat])
         textFormatItem.groupTouchBar.customizationIdentifier = @"WebTextFormatTouchBar";
@@ -9460,7 +9460,7 @@
     }
 
     NSTouchBar *textTouchBar = self.textTouchBar;
-    NSArray<NSString *> *itemIdentifiers = textTouchBar.itemIdentifiers;
+    NSArray<NSString *> *itemIdentifiers = textTouchBar.defaultItemIdentifiers;
     BOOL isShowingCombinedTextFormatItem = [itemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
     [textTouchBar setPrincipalItemIdentifier:isShowingCombinedTextFormatItem ? NSTouchBarItemIdentifierTextFormat : nil];

Modified: trunk/Source/WebKit2/ChangeLog (208622 => 208623)


--- trunk/Source/WebKit2/ChangeLog	2016-11-11 23:50:30 UTC (rev 208622)
+++ trunk/Source/WebKit2/ChangeLog	2016-11-12 00:06:40 UTC (rev 208623)
@@ -1,3 +1,24 @@
+2016-11-11  Beth Dakin  <bda...@apple.com>
+
+        Move to modern TouchBar methods
+        https://bugs.webkit.org/show_bug.cgi?id=164655
+        -and corresponding-
+        rdar://problem/29226911
+
+        Reviewed by Wenson Hsieh.
+
+        customizationDefaultItemIdentifiers -> defaultItemIdentifiers
+        itemIdentifiers -> defaultItemIdentifiers
+        defaultItems -> templateItems
+
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::plainTextTouchBarDefaultItemIdentifiers):
+        (WebKit::richTextTouchBarDefaultItemIdentifiers):
+        (WebKit::WebViewImpl::setUpTextTouchBar):
+        (WebKit::WebViewImpl::updateTextTouchBar):
+        (WebKit::plainTextTouchBarCustomizationDefaultItemIdentifiers): Deleted.
+        (WebKit::richTextTouchBarCustomizationDefaultItemIdentifiers): Deleted.
+
 2016-11-11  Brent Fulgham  <bfulg...@apple.com>
 
         Get rid of old sandbox rules for OS's we no longer support

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (208622 => 208623)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2016-11-11 23:50:30 UTC (rev 208622)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2016-11-12 00:06:40 UTC (rev 208623)
@@ -909,12 +909,12 @@
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextColorPicker, NSTouchBarItemIdentifierTextStyle, NSTouchBarItemIdentifierTextAlignment, NSTouchBarItemIdentifierTextList, NSTouchBarItemIdentifierFlexibleSpace ];
 }
 
-static NSArray<NSString *> *plainTextTouchBarCustomizationDefaultItemIdentifiers()
+static NSArray<NSString *> *plainTextTouchBarDefaultItemIdentifiers()
 {
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierCandidateList ];
 }
 
-static NSArray<NSString *> *richTextTouchBarCustomizationDefaultItemIdentifiers()
+static NSArray<NSString *> *richTextTouchBarDefaultItemIdentifiers()
 {
     return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextFormat, NSTouchBarItemIdentifierCandidateList ];
 }
@@ -934,9 +934,9 @@
 {
     bool isRichTextTouchBar = touchBar == m_richTextTouchBar.get();
     [touchBar setDelegate:m_textTouchBarItemController.get()];
-    [touchBar setDefaultItems:[NSMutableSet setWithObject:isRichTextTouchBar ? m_richTextCandidateListTouchBarItem.get() : m_plainTextCandidateListTouchBarItem.get()]];
+    [touchBar setTemplateItems:[NSMutableSet setWithObject:isRichTextTouchBar ? m_richTextCandidateListTouchBarItem.get() : m_plainTextCandidateListTouchBarItem.get()]];
     [touchBar setCustomizationAllowedItemIdentifiers:textTouchBarCustomizationAllowedIdentifiers()];
-    [touchBar setCustomizationDefaultItemIdentifiers:isRichTextTouchBar ? richTextTouchBarCustomizationDefaultItemIdentifiers() : plainTextTouchBarCustomizationDefaultItemIdentifiers()];
+    [touchBar setDefaultItemIdentifiers:isRichTextTouchBar ? richTextTouchBarDefaultItemIdentifiers() : plainTextTouchBarDefaultItemIdentifiers()];
 
     if (NSGroupTouchBarItem *textFormatItem = (NSGroupTouchBarItem *)[touchBar itemForIdentifier:NSTouchBarItemIdentifierTextFormat])
         textFormatItem.groupTouchBar.customizationIdentifier = @"WKTextFormatTouchBar";
@@ -1034,7 +1034,7 @@
     }
 
     NSTouchBar *textTouchBar = this->textTouchBar();
-    BOOL isShowingCombinedTextFormatItem = [textTouchBar.itemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
+    BOOL isShowingCombinedTextFormatItem = [textTouchBar.defaultItemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
     [textTouchBar setPrincipalItemIdentifier:isShowingCombinedTextFormatItem ? NSTouchBarItemIdentifierTextFormat : nil];
 
     // Set current typing attributes for rich text. This will ensure that the buttons reflect the state of
@@ -1049,7 +1049,7 @@
             [[m_textTouchBarItemController textListTouchBarViewController] setCurrentListType:(ListType)m_page->editorState().postLayoutData().enclosingListType];
             [m_textTouchBarItemController setCurrentTextAlignment:nsTextAlignmentFromTextAlignment((TextAlignment)editorState.postLayoutData().textAlignment)];
         }
-        BOOL isShowingCandidateListItem = [textTouchBar.itemIdentifiers containsObject:NSTouchBarItemIdentifierCandidateList] && [NSSpellChecker isAutomaticTextReplacementEnabled];
+        BOOL isShowingCandidateListItem = [textTouchBar.defaultItemIdentifiers containsObject:NSTouchBarItemIdentifierCandidateList] && [NSSpellChecker isAutomaticTextReplacementEnabled];
         [m_textTouchBarItemController setUsesNarrowTextStyleItem:isShowingCombinedTextFormatItem && isShowingCandidateListItem];
     }
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to