<!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>[180443] 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/180443">180443</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 12:10:35 -0800 (Fri, 20 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WebEditingTester] Allow dropping HTML files on the app
https://bugs.webkit.org/show_bug.cgi?id=141834

Reviewed by Simon Fraser.

* WebEditingTester/AppDelegate.m:
(-[WebEditingAppDelegate openDocument:]):
(-[WebEditingAppDelegate application:openFile:]):
Implement application:openFile:, factoring file loading code out of openDocument.

* WebEditingTester/Info.plist:
Register as an editor for HTML files.

* WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj:
Enrica is not an organization.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebEditingTesterAppDelegatem">trunk/Tools/WebEditingTester/AppDelegate.m</a></li>
<li><a href="#trunkToolsWebEditingTesterInfoplist">trunk/Tools/WebEditingTester/Info.plist</a></li>
<li><a href="#trunkToolsWebEditingTesterWebEditingTesterxcodeprojprojectpbxproj">trunk/Tools/WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180442 => 180443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-02-20 20:09:47 UTC (rev 180442)
+++ trunk/Tools/ChangeLog        2015-02-20 20:10:35 UTC (rev 180443)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-02-20  Timothy Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [WebEditingTester] Allow dropping HTML files on the app
+        https://bugs.webkit.org/show_bug.cgi?id=141834
+
+        Reviewed by Simon Fraser.
+
+        * WebEditingTester/AppDelegate.m:
+        (-[WebEditingAppDelegate openDocument:]):
+        (-[WebEditingAppDelegate application:openFile:]):
+        Implement application:openFile:, factoring file loading code out of openDocument.
+
+        * WebEditingTester/Info.plist:
+        Register as an editor for HTML files.
+
+        * WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj:
+        Enrica is not an organization.
+
+2015-02-20  Timothy Horton  &lt;timothy_horton@apple.com&gt;
+
</ins><span class="cx">         [WebEditingTester] Expand &quot;WK&quot; to &quot;WebKit&quot; in a few places
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141833
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/AppDelegate.m (180442 => 180443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/AppDelegate.m        2015-02-20 20:09:47 UTC (rev 180442)
+++ trunk/Tools/WebEditingTester/AppDelegate.m        2015-02-20 20:10:35 UTC (rev 180443)
</span><span class="lines">@@ -183,13 +183,22 @@
</span><span class="cx">         if (result != NSFileHandlingPanelOKButton)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        WebDocumentController *controller = [[_openingDocumentController alloc] init];
-        [controller.window makeKeyAndOrderFront:nil];
-        [_webDocuments addObject:controller];
-        [controller loadHTMLString:[NSString stringWithContentsOfURL:panel.URLs.lastObject encoding:NSUTF8StringEncoding error:nil]];
</del><ins>+        NSURL *URL = panel.URLs.lastObject;
+        [self application:[NSApplication sharedApplication] openFile:URL.path];
+        _openingDocumentController = nil;
</ins><span class="cx">     }];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+    Class controllerClass = _openingDocumentController ? _openingDocumentController : self._defaultWebDocumentControllerClass;
+    WebDocumentController *controller = [[controllerClass alloc] init];
+    [controller.window makeKeyAndOrderFront:nil];
+    [_webDocuments addObject:controller];
+    [controller loadHTMLString:[NSString stringWithContentsOfFile:filename encoding:NSUTF8StringEncoding error:nil]];
+    return YES;
+}
+
</ins><span class="cx"> - (void)_updateNewWindowKeyEquivalents
</span><span class="cx"> {
</span><span class="cx">     if (self.useWebKit2ByDefault) {
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterInfoplist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/Info.plist (180442 => 180443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/Info.plist        2015-02-20 20:09:47 UTC (rev 180442)
+++ trunk/Tools/WebEditingTester/Info.plist        2015-02-20 20:10:35 UTC (rev 180443)
</span><span class="lines">@@ -4,6 +4,23 @@
</span><span class="cx"> &lt;dict&gt;
</span><span class="cx">         &lt;key&gt;CFBundleDevelopmentRegion&lt;/key&gt;
</span><span class="cx">         &lt;string&gt;en&lt;/string&gt;
</span><ins>+        &lt;key&gt;CFBundleDocumentTypes&lt;/key&gt;
+        &lt;array&gt;
+                &lt;dict&gt;
+                        &lt;key&gt;CFBundleTypeExtensions&lt;/key&gt;
+                        &lt;array&gt;
+                                &lt;string&gt;html&lt;/string&gt;
+                        &lt;/array&gt;
+                        &lt;key&gt;CFBundleTypeMIMETypes&lt;/key&gt;
+                        &lt;array&gt;
+                                &lt;string&gt;text/html&lt;/string&gt;
+                        &lt;/array&gt;
+                        &lt;key&gt;CFBundleTypeName&lt;/key&gt;
+                        &lt;string&gt;HTML&lt;/string&gt;
+                        &lt;key&gt;CFBundleTypeRole&lt;/key&gt;
+                        &lt;string&gt;Editor&lt;/string&gt;
+                &lt;/dict&gt;
+        &lt;/array&gt;
</ins><span class="cx">         &lt;key&gt;CFBundleExecutable&lt;/key&gt;
</span><span class="cx">         &lt;string&gt;$(EXECUTABLE_NAME)&lt;/string&gt;
</span><span class="cx">         &lt;key&gt;CFBundleIconFile&lt;/key&gt;
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterWebEditingTesterxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj (180442 => 180443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj        2015-02-20 20:09:47 UTC (rev 180442)
+++ trunk/Tools/WebEditingTester/WebEditingTester.xcodeproj/project.pbxproj        2015-02-20 20:10:35 UTC (rev 180443)
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx">                         isa = PBXProject;
</span><span class="cx">                         attributes = {
</span><span class="cx">                                 LastUpgradeCheck = 0700;
</span><del>-                                ORGANIZATIONNAME = &quot;Enrica Casucci&quot;;
</del><span class="cx">                                 TargetAttributes = {
</span><span class="cx">                                         C558CDAB1A92D6900059A907 = {
</span><span class="cx">                                                 CreatedOnToolsVersion = 7.0;
</span></span></pre>
</div>
</div>

</body>
</html>