<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208623] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208623">208623</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 16:06:40 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (208622 => 208623)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-11 Beth Dakin <bdakin@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.
+
</ins><span class="cx"> 2016-11-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Node from ExceptionCode to ExceptionOr
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208622 => 208623)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -9296,12 +9296,12 @@
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextColorPicker, NSTouchBarItemIdentifierTextStyle, NSTouchBarItemIdentifierTextAlignment, NSTouchBarItemIdentifierTextList, NSTouchBarItemIdentifierFlexibleSpace ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray<NSString *> *)_plainTextTouchBarCustomizationDefaultItemIdentifiers
</del><ins>+- (NSArray<NSString *> *)_plainTextTouchBarDefaultItemIdentifiers
</ins><span class="cx"> {
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierCandidateList ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray<NSString *> *)_richTextTouchBarCustomizationDefaultItemIdentifiers
</del><ins>+- (NSArray<NSString *> *)_richTextTouchBarDefaultItemIdentifiers
</ins><span class="cx"> {
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextFormat, NSTouchBarItemIdentifierCandidateList ];
</span><span class="cx"> }
</span><span class="lines">@@ -9332,11 +9332,11 @@
</span><span class="cx"> {
</span><span class="cx"> BOOL isRichTextTouchBar = textTouchBar == _private->_richTextTouchBar;
</span><span class="cx"> [textTouchBar setDelegate:self];
</span><del>- [textTouchBar setDefaultItems:[NSMutableSet setWithObject:isRichTextTouchBar ? _private->_richTextCandidateListTouchBarItem.get() : _private->_plainTextCandidateListTouchBarItem.get()]];
</del><ins>+ [textTouchBar setTemplateItems:[NSMutableSet setWithObject:isRichTextTouchBar ? _private->_richTextCandidateListTouchBarItem.get() : _private->_plainTextCandidateListTouchBarItem.get()]];
</ins><span class="cx"> [textTouchBar setCustomizationAllowedItemIdentifiers:[self _textTouchBarCustomizationAllowedIdentifiers]];
</span><span class="cx">
</span><del>- NSArray<NSString *> *defaultIdentifiers = isRichTextTouchBar ? [self _richTextTouchBarCustomizationDefaultItemIdentifiers] : [self _plainTextTouchBarCustomizationDefaultItemIdentifiers];
- [textTouchBar setCustomizationDefaultItemIdentifiers:defaultIdentifiers];
</del><ins>+ NSArray<NSString *> *defaultIdentifiers = isRichTextTouchBar ? [self _richTextTouchBarDefaultItemIdentifiers] : [self _plainTextTouchBarDefaultItemIdentifiers];
+ [textTouchBar setDefaultItemIdentifiers:defaultIdentifiers];
</ins><span class="cx">
</span><span class="cx"> if (NSGroupTouchBarItem *textFormatItem = (NSGroupTouchBarItem *)[textTouchBar itemForIdentifier:NSTouchBarItemIdentifierTextFormat])
</span><span class="cx"> textFormatItem.groupTouchBar.customizationIdentifier = @"WebTextFormatTouchBar";
</span><span class="lines">@@ -9460,7 +9460,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSTouchBar *textTouchBar = self.textTouchBar;
</span><del>- NSArray<NSString *> *itemIdentifiers = textTouchBar.itemIdentifiers;
</del><ins>+ NSArray<NSString *> *itemIdentifiers = textTouchBar.defaultItemIdentifiers;
</ins><span class="cx"> BOOL isShowingCombinedTextFormatItem = [itemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
</span><span class="cx"> [textTouchBar setPrincipalItemIdentifier:isShowingCombinedTextFormatItem ? NSTouchBarItemIdentifierTextFormat : nil];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208622 => 208623)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-11 Beth Dakin <bdakin@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.
+
</ins><span class="cx"> 2016-11-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of old sandbox rules for OS's we no longer support
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (208622 => 208623)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -909,12 +909,12 @@
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextColorPicker, NSTouchBarItemIdentifierTextStyle, NSTouchBarItemIdentifierTextAlignment, NSTouchBarItemIdentifierTextList, NSTouchBarItemIdentifierFlexibleSpace ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSArray<NSString *> *plainTextTouchBarCustomizationDefaultItemIdentifiers()
</del><ins>+static NSArray<NSString *> *plainTextTouchBarDefaultItemIdentifiers()
</ins><span class="cx"> {
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierCandidateList ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSArray<NSString *> *richTextTouchBarCustomizationDefaultItemIdentifiers()
</del><ins>+static NSArray<NSString *> *richTextTouchBarDefaultItemIdentifiers()
</ins><span class="cx"> {
</span><span class="cx"> return @[ NSTouchBarItemIdentifierCharacterPicker, NSTouchBarItemIdentifierTextFormat, NSTouchBarItemIdentifierCandidateList ];
</span><span class="cx"> }
</span><span class="lines">@@ -934,9 +934,9 @@
</span><span class="cx"> {
</span><span class="cx"> bool isRichTextTouchBar = touchBar == m_richTextTouchBar.get();
</span><span class="cx"> [touchBar setDelegate:m_textTouchBarItemController.get()];
</span><del>- [touchBar setDefaultItems:[NSMutableSet setWithObject:isRichTextTouchBar ? m_richTextCandidateListTouchBarItem.get() : m_plainTextCandidateListTouchBarItem.get()]];
</del><ins>+ [touchBar setTemplateItems:[NSMutableSet setWithObject:isRichTextTouchBar ? m_richTextCandidateListTouchBarItem.get() : m_plainTextCandidateListTouchBarItem.get()]];
</ins><span class="cx"> [touchBar setCustomizationAllowedItemIdentifiers:textTouchBarCustomizationAllowedIdentifiers()];
</span><del>- [touchBar setCustomizationDefaultItemIdentifiers:isRichTextTouchBar ? richTextTouchBarCustomizationDefaultItemIdentifiers() : plainTextTouchBarCustomizationDefaultItemIdentifiers()];
</del><ins>+ [touchBar setDefaultItemIdentifiers:isRichTextTouchBar ? richTextTouchBarDefaultItemIdentifiers() : plainTextTouchBarDefaultItemIdentifiers()];
</ins><span class="cx">
</span><span class="cx"> if (NSGroupTouchBarItem *textFormatItem = (NSGroupTouchBarItem *)[touchBar itemForIdentifier:NSTouchBarItemIdentifierTextFormat])
</span><span class="cx"> textFormatItem.groupTouchBar.customizationIdentifier = @"WKTextFormatTouchBar";
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSTouchBar *textTouchBar = this->textTouchBar();
</span><del>- BOOL isShowingCombinedTextFormatItem = [textTouchBar.itemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
</del><ins>+ BOOL isShowingCombinedTextFormatItem = [textTouchBar.defaultItemIdentifiers containsObject:NSTouchBarItemIdentifierTextFormat];
</ins><span class="cx"> [textTouchBar setPrincipalItemIdentifier:isShowingCombinedTextFormatItem ? NSTouchBarItemIdentifierTextFormat : nil];
</span><span class="cx">
</span><span class="cx"> // Set current typing attributes for rich text. This will ensure that the buttons reflect the state of
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> [[m_textTouchBarItemController textListTouchBarViewController] setCurrentListType:(ListType)m_page->editorState().postLayoutData().enclosingListType];
</span><span class="cx"> [m_textTouchBarItemController setCurrentTextAlignment:nsTextAlignmentFromTextAlignment((TextAlignment)editorState.postLayoutData().textAlignment)];
</span><span class="cx"> }
</span><del>- BOOL isShowingCandidateListItem = [textTouchBar.itemIdentifiers containsObject:NSTouchBarItemIdentifierCandidateList] && [NSSpellChecker isAutomaticTextReplacementEnabled];
</del><ins>+ BOOL isShowingCandidateListItem = [textTouchBar.defaultItemIdentifiers containsObject:NSTouchBarItemIdentifierCandidateList] && [NSSpellChecker isAutomaticTextReplacementEnabled];
</ins><span class="cx"> [m_textTouchBarItemController setUsesNarrowTextStyleItem:isShowingCombinedTextFormatItem && isShowingCandidateListItem];
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>