<!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>[175941] trunk/Source/WebCore</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/175941">175941</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 09:22:11 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] WebCore includes unused cursor image resources
https://bugs.webkit.org/show_bug.cgi?id=138605
Reviewed by Anders Carlsson.
* Resources/aliasCursor.png: Removed.
* Resources/cellCursor.png: Removed.
* Resources/contextMenuCursor.png: Removed.
* Resources/copyCursor.png: Removed.
* Resources/eastResizeCursor.png: Removed.
* Resources/eastWestResizeCursor.png: Removed.
* Resources/helpCursor.png: Removed.
* Resources/linkCursor.png: Removed.
* Resources/moveCursor.png: Removed.
* Resources/noDropCursor.png: Removed.
* Resources/noneCursor.png: Removed.
* Resources/northEastResizeCursor.png: Removed.
* Resources/northEastSouthWestResizeCursor.png: Removed.
* Resources/northResizeCursor.png: Removed.
* Resources/northSouthResizeCursor.png: Removed.
* Resources/northWestResizeCursor.png: Removed.
* Resources/northWestSouthEastResizeCursor.png: Removed.
* Resources/progressCursor.png: Removed.
* Resources/southEastResizeCursor.png: Removed.
* Resources/southResizeCursor.png: Removed.
* Resources/southWestResizeCursor.png: Removed.
* Resources/verticalTextCursor.png: Removed.
* Resources/waitCursor.png: Removed.
* Resources/westResizeCursor.png: Removed.
* Resources/zoomInCursor.png: Removed.
* Resources/zoomOutCursor.png: Removed.
* WebCore.xcodeproj/project.pbxproj: Removed references to the above files.
* platform/mac/CursorMac.mm:
(WebCore::Cursor::ensurePlatformCursor): For Help, Cell, ZoomIn and ZoomOut, don’t check
for a nil return value from wkCursor(), which can’t occur in any supported configuration.
For None, create a cursor with an empty NSImage instead of loading a transparent image from
the file system.
(WebCore::createNamedCursor): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmacCursorMacmm">trunk/Source/WebCore/platform/mac/CursorMac.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreResourcesaliasCursorpng">trunk/Source/WebCore/Resources/aliasCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcescellCursorpng">trunk/Source/WebCore/Resources/cellCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcescontextMenuCursorpng">trunk/Source/WebCore/Resources/contextMenuCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcescopyCursorpng">trunk/Source/WebCore/Resources/copyCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceseastResizeCursorpng">trunk/Source/WebCore/Resources/eastResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceseastWestResizeCursorpng">trunk/Source/WebCore/Resources/eastWestResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceshelpCursorpng">trunk/Source/WebCore/Resources/helpCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceslinkCursorpng">trunk/Source/WebCore/Resources/linkCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesmoveCursorpng">trunk/Source/WebCore/Resources/moveCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnoDropCursorpng">trunk/Source/WebCore/Resources/noDropCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnoneCursorpng">trunk/Source/WebCore/Resources/noneCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthEastResizeCursorpng">trunk/Source/WebCore/Resources/northEastResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthEastSouthWestResizeCursorpng">trunk/Source/WebCore/Resources/northEastSouthWestResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthResizeCursorpng">trunk/Source/WebCore/Resources/northResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthSouthResizeCursorpng">trunk/Source/WebCore/Resources/northSouthResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthWestResizeCursorpng">trunk/Source/WebCore/Resources/northWestResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesnorthWestSouthEastResizeCursorpng">trunk/Source/WebCore/Resources/northWestSouthEastResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesprogressCursorpng">trunk/Source/WebCore/Resources/progressCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcessouthEastResizeCursorpng">trunk/Source/WebCore/Resources/southEastResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcessouthResizeCursorpng">trunk/Source/WebCore/Resources/southResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcessouthWestResizeCursorpng">trunk/Source/WebCore/Resources/southWestResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourcesverticalTextCursorpng">trunk/Source/WebCore/Resources/verticalTextCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceswaitCursorpng">trunk/Source/WebCore/Resources/waitCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceswestResizeCursorpng">trunk/Source/WebCore/Resources/westResizeCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceszoomInCursorpng">trunk/Source/WebCore/Resources/zoomInCursor.png</a></li>
<li><a href="#trunkSourceWebCoreResourceszoomOutCursorpng">trunk/Source/WebCore/Resources/zoomOutCursor.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175940 => 175941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 17:21:41 UTC (rev 175940)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 17:22:11 UTC (rev 175941)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-11-11 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebCore includes unused cursor image resources
+ https://bugs.webkit.org/show_bug.cgi?id=138605
+
+ Reviewed by Anders Carlsson.
+
+ * Resources/aliasCursor.png: Removed.
+ * Resources/cellCursor.png: Removed.
+ * Resources/contextMenuCursor.png: Removed.
+ * Resources/copyCursor.png: Removed.
+ * Resources/eastResizeCursor.png: Removed.
+ * Resources/eastWestResizeCursor.png: Removed.
+ * Resources/helpCursor.png: Removed.
+ * Resources/linkCursor.png: Removed.
+ * Resources/moveCursor.png: Removed.
+ * Resources/noDropCursor.png: Removed.
+ * Resources/noneCursor.png: Removed.
+ * Resources/northEastResizeCursor.png: Removed.
+ * Resources/northEastSouthWestResizeCursor.png: Removed.
+ * Resources/northResizeCursor.png: Removed.
+ * Resources/northSouthResizeCursor.png: Removed.
+ * Resources/northWestResizeCursor.png: Removed.
+ * Resources/northWestSouthEastResizeCursor.png: Removed.
+ * Resources/progressCursor.png: Removed.
+ * Resources/southEastResizeCursor.png: Removed.
+ * Resources/southResizeCursor.png: Removed.
+ * Resources/southWestResizeCursor.png: Removed.
+ * Resources/verticalTextCursor.png: Removed.
+ * Resources/waitCursor.png: Removed.
+ * Resources/westResizeCursor.png: Removed.
+ * Resources/zoomInCursor.png: Removed.
+ * Resources/zoomOutCursor.png: Removed.
+
+ * WebCore.xcodeproj/project.pbxproj: Removed references to the above files.
+
+ * platform/mac/CursorMac.mm:
+ (WebCore::Cursor::ensurePlatformCursor): For Help, Cell, ZoomIn and ZoomOut, don’t check
+ for a nil return value from wkCursor(), which can’t occur in any supported configuration.
+ For None, create a cursor with an empty NSImage instead of loading a transparent image from
+ the file system.
+ (WebCore::createNamedCursor): Deleted.
+
</ins><span class="cx"> 2014-11-11 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r175844.
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesaliasCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/aliasCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcescellCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/cellCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcescontextMenuCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/contextMenuCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcescopyCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/copyCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceseastResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/eastResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceseastWestResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/eastWestResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceshelpCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/helpCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceslinkCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/linkCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesmoveCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/moveCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnoDropCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/noDropCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnoneCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/noneCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthEastResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northEastResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthEastSouthWestResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northEastSouthWestResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthSouthResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northSouthResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthWestResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northWestResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesnorthWestSouthEastResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/northWestSouthEastResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesprogressCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/progressCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcessouthEastResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/southEastResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcessouthResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/southResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcessouthWestResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/southWestResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourcesverticalTextCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/verticalTextCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceswaitCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/waitCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceswestResizeCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/westResizeCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceszoomInCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/zoomInCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreResourceszoomOutCursorpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebCore/Resources/zoomOutCursor.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (175940 => 175941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-11 17:21:41 UTC (rev 175940)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-11 17:22:11 UTC (rev 175941)
</span><span class="lines">@@ -806,8 +806,6 @@
</span><span class="cx"> 1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB09DB416AF5F6C008538E7 /* StorageStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */; };
</span><span class="cx"> 1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; };
- 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */; };
</del><span class="cx"> 1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
</span><span class="cx"> 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
</span><span class="cx"> 1AB5EBD2194A50F30059AC70 /* HTTPHeaderNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC900C21943C0A0008625B5 /* HTTPHeaderNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1604,11 +1602,6 @@
</span><span class="cx"> 4643783119F720EF001E38B3 /* QuickLookMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 4643782F19F720EF001E38B3 /* QuickLookMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4643783219F720EF001E38B3 /* QuickLookMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4643783019F720EF001E38B3 /* QuickLookMac.mm */; };
</span><span class="cx"> 4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; };
</span><del>- 46BD16E30B279473001F0839 /* noneCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46BD16E20B279473001F0839 /* noneCursor.png */; };
- 46D4F2490AF97E810035385A /* cellCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2460AF97E810035385A /* cellCursor.png */; };
- 46D4F24B0AF97E810035385A /* verticalTextCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2480AF97E810035385A /* verticalTextCursor.png */; };
- 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */; };
- 46F9D5DF0B0D60170028EE36 /* progressCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46F9D5DC0B0D60170028EE36 /* progressCursor.png */; };
</del><span class="cx"> 490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */; };
</span><span class="cx"> 490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */; };
</span><span class="cx"> 49291E4B134172C800E753DE /* ImageRenderingMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 49291E4A134172C800E753DE /* ImageRenderingMode.h */; };
</span><span class="lines">@@ -2661,22 +2654,6 @@
</span><span class="cx"> 85089CDE0A98C42800A275AA /* DOMEntityReference.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85089CD60A98C42800A275AA /* DOMEntityReference.mm */; };
</span><span class="cx"> 850B41C20AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 850B41C00AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h */; };
</span><span class="cx"> 850B41C30AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 850B41C10AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h */; };
</span><del>- 85136C990AED665900F90A3D /* eastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C890AED665800F90A3D /* eastResizeCursor.png */; };
- 85136C9A0AED665900F90A3D /* eastWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */; };
- 85136C9B0AED665900F90A3D /* helpCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8B0AED665800F90A3D /* helpCursor.png */; };
- 85136C9C0AED665900F90A3D /* linkCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8C0AED665800F90A3D /* linkCursor.png */; };
- 85136C9D0AED665900F90A3D /* moveCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8D0AED665800F90A3D /* moveCursor.png */; };
- 85136C9E0AED665900F90A3D /* northEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */; };
- 85136C9F0AED665900F90A3D /* northEastSouthWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */; };
- 85136CA00AED665900F90A3D /* northResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C900AED665900F90A3D /* northResizeCursor.png */; };
- 85136CA10AED665900F90A3D /* northSouthResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C910AED665900F90A3D /* northSouthResizeCursor.png */; };
- 85136CA20AED665900F90A3D /* northWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C920AED665900F90A3D /* northWestResizeCursor.png */; };
- 85136CA30AED665900F90A3D /* northWestSouthEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */; };
- 85136CA40AED665900F90A3D /* southEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C940AED665900F90A3D /* southEastResizeCursor.png */; };
- 85136CA50AED665900F90A3D /* southResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C950AED665900F90A3D /* southResizeCursor.png */; };
- 85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C960AED665900F90A3D /* southWestResizeCursor.png */; };
- 85136CA70AED665900F90A3D /* waitCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C970AED665900F90A3D /* waitCursor.png */; };
- 85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C980AED665900F90A3D /* westResizeCursor.png */; };
</del><span class="cx"> 85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */; };
</span><span class="cx"> 85183B420AA6926100F19FA3 /* DOMHTMLBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85183B380AA6926100F19FA3 /* DOMHTMLBRElement.h */; };
</span><span class="cx"> 85183B430AA6926100F19FA3 /* DOMHTMLBRElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85183B390AA6926100F19FA3 /* DOMHTMLBRElement.mm */; };
</span><span class="lines">@@ -7793,8 +7770,6 @@
</span><span class="cx"> 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeNode.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageStrategy.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageStrategy.h; sourceTree = "<group>"; };
</span><del>- 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
- 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; };
</del><span class="cx"> 1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShapeValue.cpp; path = style/ShapeValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -8688,11 +8663,6 @@
</span><span class="cx"> 4643782F19F720EF001E38B3 /* QuickLookMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 4643783019F720EF001E38B3 /* QuickLookMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; };
</span><del>- 46BD16E20B279473001F0839 /* noneCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = noneCursor.png; sourceTree = "<group>"; };
- 46D4F2460AF97E810035385A /* cellCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cellCursor.png; sourceTree = "<group>"; };
- 46D4F2480AF97E810035385A /* verticalTextCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = verticalTextCursor.png; sourceTree = "<group>"; };
- 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aliasCursor.png; sourceTree = "<group>"; };
- 46F9D5DC0B0D60170028EE36 /* progressCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progressCursor.png; sourceTree = "<group>"; };
</del><span class="cx"> 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ANGLEWebKitBridge.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANGLEWebKitBridge.h; sourceTree = "<group>"; };
</span><span class="cx"> 49291E4A134172C800E753DE /* ImageRenderingMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageRenderingMode.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9850,22 +9820,6 @@
</span><span class="cx"> 85089CD60A98C42800A275AA /* DOMEntityReference.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMEntityReference.mm; sourceTree = "<group>"; };
</span><span class="cx"> 850B41C00AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNodeIteratorInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 850B41C10AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMTreeWalkerInternal.h; sourceTree = "<group>"; };
</span><del>- 85136C890AED665800F90A3D /* eastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eastResizeCursor.png; sourceTree = "<group>"; };
- 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eastWestResizeCursor.png; sourceTree = "<group>"; };
- 85136C8B0AED665800F90A3D /* helpCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpCursor.png; sourceTree = "<group>"; };
- 85136C8C0AED665800F90A3D /* linkCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = linkCursor.png; sourceTree = "<group>"; };
- 85136C8D0AED665800F90A3D /* moveCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = moveCursor.png; sourceTree = "<group>"; };
- 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northEastResizeCursor.png; sourceTree = "<group>"; };
- 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northEastSouthWestResizeCursor.png; sourceTree = "<group>"; };
- 85136C900AED665900F90A3D /* northResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northResizeCursor.png; sourceTree = "<group>"; };
- 85136C910AED665900F90A3D /* northSouthResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northSouthResizeCursor.png; sourceTree = "<group>"; };
- 85136C920AED665900F90A3D /* northWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northWestResizeCursor.png; sourceTree = "<group>"; };
- 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northWestSouthEastResizeCursor.png; sourceTree = "<group>"; };
- 85136C940AED665900F90A3D /* southEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southEastResizeCursor.png; sourceTree = "<group>"; };
- 85136C950AED665900F90A3D /* southResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southResizeCursor.png; sourceTree = "<group>"; };
- 85136C960AED665900F90A3D /* southWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southWestResizeCursor.png; sourceTree = "<group>"; };
- 85136C970AED665900F90A3D /* waitCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waitCursor.png; sourceTree = "<group>"; };
- 85136C980AED665900F90A3D /* westResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = westResizeCursor.png; sourceTree = "<group>"; };
</del><span class="cx"> 85183B380AA6926100F19FA3 /* DOMHTMLBRElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBRElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 85183B390AA6926100F19FA3 /* DOMHTMLBRElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLBRElement.mm; sourceTree = "<group>"; };
</span><span class="cx"> 85183B3A0AA6926100F19FA3 /* DOMHTMLHeadingElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLHeadingElement.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14870,38 +14824,15 @@
</span><span class="cx"> children = (
</span><span class="cx"> CD0DBB3E142274E600280263 /* audio */,
</span><span class="cx"> 65998A650E5F5FD3004E097A /* images */,
</span><del>- 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */,
- 46D4F2460AF97E810035385A /* cellCursor.png */,
- 85136C890AED665800F90A3D /* eastResizeCursor.png */,
- 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */,
- 85136C8B0AED665800F90A3D /* helpCursor.png */,
</del><span class="cx"> 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */,
</span><span class="cx"> 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */,
</span><del>- 85136C8C0AED665800F90A3D /* linkCursor.png */,
</del><span class="cx"> BCAD1808131C7A0D00990406 /* Localizable.strings */,
</span><span class="cx"> 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
</span><span class="cx"> 93153BE114195A5700FCF5BE /* missingImage.png */,
</span><span class="cx"> 93153BD914181F7A00FCF5BE /* missingImage@2x.png */,
</span><del>- 85136C8D0AED665800F90A3D /* moveCursor.png */,
- 46BD16E20B279473001F0839 /* noneCursor.png */,
- 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */,
- 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */,
- 85136C900AED665900F90A3D /* northResizeCursor.png */,
- 85136C910AED665900F90A3D /* northSouthResizeCursor.png */,
- 85136C920AED665900F90A3D /* northWestResizeCursor.png */,
- 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */,
</del><span class="cx"> 713E70AF1733E8B300A22D00 /* plugIns.js */,
</span><del>- 46F9D5DC0B0D60170028EE36 /* progressCursor.png */,
- 85136C940AED665900F90A3D /* southEastResizeCursor.png */,
- 85136C950AED665900F90A3D /* southResizeCursor.png */,
- 85136C960AED665900F90A3D /* southWestResizeCursor.png */,
</del><span class="cx"> 93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */,
</span><span class="cx"> 9370918C1416D86B00477333 /* textAreaResizeCorner@2x.png */,
</span><del>- 46D4F2480AF97E810035385A /* verticalTextCursor.png */,
- 85136C970AED665900F90A3D /* waitCursor.png */,
- 85136C980AED665900F90A3D /* westResizeCursor.png */,
- 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */,
- 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */,
</del><span class="cx"> );
</span><span class="cx"> path = Resources;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -26934,17 +26865,11 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */,
</del><span class="cx"> 1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */,
</span><del>- 46D4F2490AF97E810035385A /* cellCursor.png in Resources */,
</del><span class="cx"> D02B64B214089E56006EFA21 /* DictationPhraseWithAlternativesDot.png in Resources */,
</span><span class="cx"> D02B64B314089E56006EFA21 /* DictationPhraseWithAlternativesDot@2x.png in Resources */,
</span><del>- 85136C990AED665900F90A3D /* eastResizeCursor.png in Resources */,
- 85136C9A0AED665900F90A3D /* eastWestResizeCursor.png in Resources */,
- 85136C9B0AED665900F90A3D /* helpCursor.png in Resources */,
</del><span class="cx"> 7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */,
</span><span class="cx"> 2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
</span><del>- 85136C9C0AED665900F90A3D /* linkCursor.png in Resources */,
</del><span class="cx"> BCAD180A131C7A0D00990406 /* Localizable.strings in Resources */,
</span><span class="cx"> 311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
</span><span class="cx"> 311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */,
</span><span class="lines">@@ -26952,28 +26877,11 @@
</span><span class="cx"> 311C08C018EB7CAF00B65615 /* mediaControlsiOS.js in Resources */,
</span><span class="cx"> 93153BE214195A5700FCF5BE /* missingImage.png in Resources */,
</span><span class="cx"> 93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */,
</span><del>- 85136C9D0AED665900F90A3D /* moveCursor.png in Resources */,
- 46BD16E30B279473001F0839 /* noneCursor.png in Resources */,
- 85136C9E0AED665900F90A3D /* northEastResizeCursor.png in Resources */,
- 85136C9F0AED665900F90A3D /* northEastSouthWestResizeCursor.png in Resources */,
- 85136CA00AED665900F90A3D /* northResizeCursor.png in Resources */,
- 85136CA10AED665900F90A3D /* northSouthResizeCursor.png in Resources */,
- 85136CA20AED665900F90A3D /* northWestResizeCursor.png in Resources */,
- 85136CA30AED665900F90A3D /* northWestSouthEastResizeCursor.png in Resources */,
- 46F9D5DF0B0D60170028EE36 /* progressCursor.png in Resources */,
- 85136CA40AED665900F90A3D /* southEastResizeCursor.png in Resources */,
</del><span class="cx"> 7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */,
</span><del>- 85136CA50AED665900F90A3D /* southResizeCursor.png in Resources */,
- 85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */,
</del><span class="cx"> BE8C753110681324001E93F5 /* SpellingDot.png in Resources */,
</span><span class="cx"> 01E6C2E41194B2820050821C /* SpellingDot@2x.png in Resources */,
</span><span class="cx"> 93153BDC141959BC00FCF5BE /* textAreaResizeCorner.png in Resources */,
</span><span class="cx"> 9370918D1416D86B00477333 /* textAreaResizeCorner@2x.png in Resources */,
</span><del>- 46D4F24B0AF97E810035385A /* verticalTextCursor.png in Resources */,
- 85136CA70AED665900F90A3D /* waitCursor.png in Resources */,
- 85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */,
- 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */,
- 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacCursorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (175940 => 175941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2014-11-11 17:21:41 UTC (rev 175940)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2014-11-11 17:22:11 UTC (rev 175941)
</span><span class="lines">@@ -53,22 +53,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RetainPtr<NSCursor> createNamedCursor(const char* name, int x, int y)
-{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
- RetainPtr<NSString> resourceName = adoptNS([[NSString alloc] initWithUTF8String:name]);
- RetainPtr<NSImage> cursorImage = adoptNS([[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreCursorBundle class]] pathForResource:resourceName.get() ofType:@"png"]]);
-
- RetainPtr<NSCursor> cursor;
-
- if (cursorImage)
- cursor = adoptNS([[NSCursor alloc] initWithImage:cursorImage.get() hotSpot:NSMakePoint(x, y)]);
-
- return cursor;
- END_BLOCK_OBJC_EXCEPTIONS;
- return nil;
-}
-
</del><span class="cx"> void Cursor::ensurePlatformCursor() const
</span><span class="cx"> {
</span><span class="cx"> if (m_platformCursor)
</span><span class="lines">@@ -97,9 +81,6 @@
</span><span class="cx">
</span><span class="cx"> case Cursor::Help:
</span><span class="cx"> m_platformCursor = wkCursor("Help");
</span><del>- if (m_platformCursor)
- break;
- m_platformCursor = createNamedCursor("helpCursor", 8, 8);
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::Move:
</span><span class="lines">@@ -177,9 +158,6 @@
</span><span class="cx">
</span><span class="cx"> case Cursor::Cell:
</span><span class="cx"> m_platformCursor = wkCursor("Cell");
</span><del>- if (m_platformCursor)
- break;
- m_platformCursor = createNamedCursor("cellCursor", 7, 7);
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::ContextMenu:
</span><span class="lines">@@ -203,7 +181,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::None:
</span><del>- m_platformCursor = createNamedCursor("noneCursor", 7, 7);
</del><ins>+ m_platformCursor = adoptNS([[NSCursor alloc] initWithImage:adoptNS([[NSImage alloc] initWithSize:NSMakeSize(1, 1)]).get() hotSpot:NSZeroPoint]);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::NotAllowed:
</span><span class="lines">@@ -212,16 +190,10 @@
</span><span class="cx">
</span><span class="cx"> case Cursor::ZoomIn:
</span><span class="cx"> m_platformCursor = wkCursor("ZoomIn");
</span><del>- if (m_platformCursor)
- break;
- m_platformCursor = createNamedCursor("zoomInCursor", 7, 7);
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::ZoomOut:
</span><span class="cx"> m_platformCursor = wkCursor("ZoomOut");
</span><del>- if (m_platformCursor)
- break;
- m_platformCursor = createNamedCursor("zoomOutCursor", 7, 7);
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Cursor::Grab:
</span></span></pre>
</div>
</div>
</body>
</html>