<!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>[180440] trunk/Tools</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/180440">180440</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 12:04:30 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebEditingTester] Expand "WK" to "WebKit" in a few places
https://bugs.webkit.org/show_bug.cgi?id=141833
Reviewed by Anders Carlsson.
* WebEditingTester/AppDelegate.h:
* WebEditingTester/AppDelegate.m:
(-[WebEditingAppDelegate newEditor:]):
(-[WebEditingAppDelegate toggleUseWebKit2ByDefault:]):
(-[WebEditingAppDelegate validateMenuItem:]):
(-[WebEditingAppDelegate _updateNewWindowKeyEquivalents]):
(-[WebEditingAppDelegate applicationDidFinishLaunching:]): Deleted.
(-[WebEditingAppDelegate applicationWillTerminate:]): Deleted.
(-[WebEditingAppDelegate showOperations:]): Deleted.
* WebEditingTester/MainMenu.xib:
The WK abbreviation is unnaturally grating in menu items for some reason.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebEditingTesterAppDelegateh">trunk/Tools/WebEditingTester/AppDelegate.h</a></li>
<li><a href="#trunkToolsWebEditingTesterAppDelegatem">trunk/Tools/WebEditingTester/AppDelegate.m</a></li>
<li><a href="#trunkToolsWebEditingTesterMainMenuxib">trunk/Tools/WebEditingTester/MainMenu.xib</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180439 => 180440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-20 20:02:39 UTC (rev 180439)
+++ trunk/Tools/ChangeLog 2015-02-20 20:04:30 UTC (rev 180440)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-20 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ [WebEditingTester] Expand "WK" to "WebKit" in a few places
+ https://bugs.webkit.org/show_bug.cgi?id=141833
+
+ Reviewed by Anders Carlsson.
+
+ * WebEditingTester/AppDelegate.h:
+ * WebEditingTester/AppDelegate.m:
+ (-[WebEditingAppDelegate newEditor:]):
+ (-[WebEditingAppDelegate toggleUseWebKit2ByDefault:]):
+ (-[WebEditingAppDelegate validateMenuItem:]):
+ (-[WebEditingAppDelegate _updateNewWindowKeyEquivalents]):
+ (-[WebEditingAppDelegate applicationDidFinishLaunching:]): Deleted.
+ (-[WebEditingAppDelegate applicationWillTerminate:]): Deleted.
+ (-[WebEditingAppDelegate showOperations:]): Deleted.
+ * WebEditingTester/MainMenu.xib:
+ The WK abbreviation is unnaturally grating in menu items for some reason.
+
+2015-02-20 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> [WebEditingTester] Add a custom protocol for loading canned content
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141830
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterAppDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/AppDelegate.h (180439 => 180440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/AppDelegate.h 2015-02-20 20:02:39 UTC (rev 180439)
+++ trunk/Tools/WebEditingTester/AppDelegate.h 2015-02-20 20:04:30 UTC (rev 180440)
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx">
</span><span class="cx"> @interface WebEditingAppDelegate : NSObject <NSApplicationDelegate> {
</span><span class="cx"> NSMutableSet *_webDocuments;
</span><del>- IBOutlet NSMenuItem *_newWK1EditorItem;
- IBOutlet NSMenuItem *_newWK2EditorItem;
</del><ins>+ IBOutlet NSMenuItem *_newWebKit1EditorItem;
+ IBOutlet NSMenuItem *_newWebKit2EditorItem;
</ins><span class="cx"> IBOutlet NSPanel *_operationsPanel;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)newEditor:(id)sender;
</span><span class="cx"> - (IBAction)showOperations:(id)sender;
</span><del>-- (IBAction)toggleUseWK2ByDefault:(id)sender;
</del><ins>+- (IBAction)toggleUseWebKit2ByDefault:(id)sender;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/AppDelegate.m (180439 => 180440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/AppDelegate.m 2015-02-20 20:02:39 UTC (rev 180439)
+++ trunk/Tools/WebEditingTester/AppDelegate.m 2015-02-20 20:04:30 UTC (rev 180440)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx">
</span><span class="cx"> if (sender == self)
</span><span class="cx"> controllerClass = self._defaultWebDocumentControllerClass;
</span><del>- else if (sender == _newWK2EditorItem)
</del><ins>+ else if (sender == _newWebKit2EditorItem)
</ins><span class="cx"> controllerClass = [WK2WebDocumentController class];
</span><del>- else if (sender == _newWK1EditorItem)
</del><ins>+ else if (sender == _newWebKit1EditorItem)
</ins><span class="cx"> controllerClass = [WK1WebDocumentController class];
</span><span class="cx">
</span><span class="cx"> WebDocumentController *controller = [[controllerClass alloc] init];
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:UseWebKit2ByDefaultPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleUseWK2ByDefault:(id)sender
</del><ins>+- (IBAction)toggleUseWebKit2ByDefault:(id)sender
</ins><span class="cx"> {
</span><span class="cx"> NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><span class="cx"> [defaults setBool:![defaults boolForKey:UseWebKit2ByDefaultPreferenceKey] forKey:UseWebKit2ByDefaultPreferenceKey];
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> {
</span><span class="cx"> SEL action = [menuItem action];
</span><span class="cx">
</span><del>- if (action == @selector(toggleUseWK2ByDefault:))
</del><ins>+ if (action == @selector(toggleUseWebKit2ByDefault:))
</ins><span class="cx"> [menuItem setState:[self useWebKit2ByDefault] ? NSOnState : NSOffState];
</span><span class="cx">
</span><span class="cx"> return YES;
</span><span class="lines">@@ -193,11 +193,11 @@
</span><span class="cx"> - (void)_updateNewWindowKeyEquivalents
</span><span class="cx"> {
</span><span class="cx"> if (self.useWebKit2ByDefault) {
</span><del>- [_newWK1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
- [_newWK2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
</del><ins>+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
</ins><span class="cx"> } else {
</span><del>- [_newWK1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
- [_newWK2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
</del><ins>+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/MainMenu.xib (180439 => 180440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/MainMenu.xib 2015-02-20 20:02:39 UTC (rev 180439)
+++ trunk/Tools/WebEditingTester/MainMenu.xib 2015-02-20 20:04:30 UTC (rev 180440)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
</span><span class="cx"> <customObject id="Voe-Tx-rLC" userLabel="Delegate" customClass="WebEditingAppDelegate">
</span><span class="cx"> <connections>
</span><del>- <outlet property="_newWK1EditorItem" destination="2Pd-3X-Tvf" id="oy2-LL-9U7"/>
- <outlet property="_newWK2EditorItem" destination="kzr-0m-cAu" id="vsf-6z-Lk3"/>
</del><ins>+ <outlet property="_newWebKit1EditorItem" destination="2Pd-3X-Tvf" id="YUu-7J-250"/>
+ <outlet property="_newWebKit2EditorItem" destination="kzr-0m-cAu" id="ljF-38-G4o"/>
</ins><span class="cx"> <outlet property="_operationsPanel" destination="XRZ-ss-zpK" id="YJ2-gq-nmx"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </customObject>
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <menu key="submenu" title="File" id="bib-Uj-vzu">
</span><span class="cx"> <items>
</span><del>- <menuItem title="New WK1 Editor" keyEquivalent="n" id="2Pd-3X-Tvf" userLabel="New WK1 Editor">
</del><ins>+ <menuItem title="New WebKit1 Editor" keyEquivalent="n" id="2Pd-3X-Tvf" userLabel="New WK1 Editor">
</ins><span class="cx"> <connections>
</span><span class="cx"> <action selector="newEditor:" target="Voe-Tx-rLC" id="21m-3B-oXY"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="New WK2 Editor" alternate="YES" keyEquivalent="n" id="kzr-0m-cAu" userLabel="New WK2 Editor">
</del><ins>+ <menuItem title="New WebKit2 Editor" alternate="YES" keyEquivalent="n" id="kzr-0m-cAu" userLabel="New WK2 Editor">
</ins><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="newEditor:" target="Voe-Tx-rLC" id="Za3-gM-3R7"/>
</span><span class="lines">@@ -670,10 +670,10 @@
</span><span class="cx"> <action selector="pasteAsMarkup:" target="-1" id="Ejb-zz-08R"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="Use WK2 by default" id="AiO-8z-Uwi">
</del><ins>+ <menuItem title="Use WebKit2 by Default" id="AiO-8z-Uwi">
</ins><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <connections>
</span><del>- <action selector="toggleUseWK2ByDefault:" target="Voe-Tx-rLC" id="GoJ-wy-wd2"/>
</del><ins>+ <action selector="toggleUseWebKit2ByDefault:" target="Voe-Tx-rLC" id="MFc-Wa-XWw"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> </items>
</span></span></pre>
</div>
</div>
</body>
</html>