<!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>[175983] trunk/Source/WebKit2</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/175983">175983</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 15:23:22 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update artwork for some action menu items
https://bugs.webkit.org/show_bug.cgi?id=138634
<rdar://problem/18871984>
Reviewed by Anders Carlsson.
* Resources/OpenInNewWindowTemplate.pdf: Removed.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _createActionMenuItemForTag:]):
(webKitBundleImageNamed): Deleted.
* WebKit2.xcodeproj/project.pbxproj:
Get rid of our custom art, and use system art for two more items.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ResourcesOpenInNewWindowTemplatepdf">trunk/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175982 => 175983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-11 23:13:05 UTC (rev 175982)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-11 23:23:22 UTC (rev 175983)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
+ Update artwork for some action menu items
+ https://bugs.webkit.org/show_bug.cgi?id=138634
+ <rdar://problem/18871984>
+
+ Reviewed by Anders Carlsson.
+
+ * Resources/OpenInNewWindowTemplate.pdf: Removed.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _createActionMenuItemForTag:]):
+ (webKitBundleImageNamed): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+ Get rid of our custom art, and use system art for two more items.
+
</ins><span class="cx"> 2014-11-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> DRT and WKTR touch disk cache
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesOpenInNewWindowTemplatepdf"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebKit2/Resources/OpenInNewWindowTemplate.pdf</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175982 => 175983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 23:13:05 UTC (rev 175982)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 23:23:22 UTC (rev 175983)
</span><span class="lines">@@ -729,7 +729,7 @@
</span><span class="cx"> case kWKContextActionItemTagOpenLinkInDefaultBrowser:
</span><span class="cx"> selector = @selector(_openURLFromActionMenu:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
</span><del>- image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
</del><ins>+ image = [NSImage imageNamed:@"NSActionMenuOpenInNewWindow"];
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> case kWKContextActionItemTagAddLinkToSafariReadingList:
</span><span class="cx"> selector = @selector(_addToReadingListFromActionMenu:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item");
</span><del>- image = [NSImage imageNamed:NSImageNameBookmarksTemplate];
</del><ins>+ image = [NSImage imageNamed:@"NSActionMenuAddToReadingList"];
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagCopyImage:
</span><span class="lines">@@ -821,11 +821,6 @@
</span><span class="cx"> return item;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSImage *webKitBundleImageNamed(NSString *name)
-{
- return [[NSBundle bundleForClass:[WKView class]] imageForResource:name];
-}
-
</del><span class="cx"> - (PassRefPtr<WebHitTestResult>)_webHitTestResult
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (175982 => 175983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-11 23:13:05 UTC (rev 175982)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-11 23:23:22 UTC (rev 175983)
</span><span class="lines">@@ -1078,7 +1078,6 @@
</span><span class="cx"> 909854EC12BC4E17000AD080 /* WebMemorySampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 905620E812BC248B000799B6 /* WebMemorySampler.cpp */; };
</span><span class="cx"> 909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 905620E912BC248B000799B6 /* WebMemorySampler.h */; };
</span><span class="cx"> 909854EE12BC4E18000AD080 /* WebMemorySampler.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */; };
</span><del>- 9348427D19F19BD10009D5AE /* OpenInNewWindowTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */; };
</del><span class="cx"> 934B724419F5B9BE00AE96D6 /* WKActionMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB951277616D003322B8 /* WKBundleBackForwardList.cpp */; };
</span><span class="lines">@@ -3142,7 +3141,6 @@
</span><span class="cx"> 905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMemorySampler.mac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 905620E812BC248B000799B6 /* WebMemorySampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMemorySampler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 905620E912BC248B000799B6 /* WebMemorySampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMemorySampler.h; sourceTree = "<group>"; };
</span><del>- 9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = OpenInNewWindowTemplate.pdf; path = Resources/OpenInNewWindowTemplate.pdf; sourceTree = "<group>"; };
</del><span class="cx"> 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKActionMenuItemTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 935EEB8F1277615D003322B8 /* InjectedBundleBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleBackForwardList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 935EEB901277615D003322B8 /* InjectedBundleBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleBackForwardList.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4018,7 +4016,6 @@
</span><span class="cx"> 1C8AE7601992F62F00ABF6EC /* DockRightLegacy.pdf */,
</span><span class="cx"> 8DC2EF5A0486A6940098B216 /* Info.plist */,
</span><span class="cx"> 089C1666FE841158C02AAC07 /* InfoPlist.strings */,
</span><del>- 9348427C19F19BD00009D5AE /* OpenInNewWindowTemplate.pdf */,
</del><span class="cx"> E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
</span><span class="cx"> E133FD891423DD7F00FC7BFB /* WebKit.icns */,
</span><span class="cx"> );
</span><span class="lines">@@ -8335,7 +8332,6 @@
</span><span class="cx"> E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
</span><span class="cx"> 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */,
</span><span class="cx"> E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
</span><del>- 9348427D19F19BD10009D5AE /* OpenInNewWindowTemplate.pdf in Resources */,
</del><span class="cx"> 1CB75C941701E880009F809F /* DockRight.pdf in Resources */,
</span><span class="cx"> 1C8AE7611992F63A00ABF6EC /* DockBottomLegacy.pdf in Resources */,
</span><span class="cx"> 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
</span></span></pre>
</div>
</div>
</body>
</html>