Changeset 175941 in webkit


Ignore:
Timestamp:
Nov 11, 2014 9:22:11 AM (9 years ago)
Author:
mitz@apple.com
Message:

[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.

Location:
trunk/Source/WebCore
Files:
26 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r175939 r175941  
     12014-11-11  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] WebCore includes unused cursor image resources
     4        https://bugs.webkit.org/show_bug.cgi?id=138605
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Resources/aliasCursor.png: Removed.
     9        * Resources/cellCursor.png: Removed.
     10        * Resources/contextMenuCursor.png: Removed.
     11        * Resources/copyCursor.png: Removed.
     12        * Resources/eastResizeCursor.png: Removed.
     13        * Resources/eastWestResizeCursor.png: Removed.
     14        * Resources/helpCursor.png: Removed.
     15        * Resources/linkCursor.png: Removed.
     16        * Resources/moveCursor.png: Removed.
     17        * Resources/noDropCursor.png: Removed.
     18        * Resources/noneCursor.png: Removed.
     19        * Resources/northEastResizeCursor.png: Removed.
     20        * Resources/northEastSouthWestResizeCursor.png: Removed.
     21        * Resources/northResizeCursor.png: Removed.
     22        * Resources/northSouthResizeCursor.png: Removed.
     23        * Resources/northWestResizeCursor.png: Removed.
     24        * Resources/northWestSouthEastResizeCursor.png: Removed.
     25        * Resources/progressCursor.png: Removed.
     26        * Resources/southEastResizeCursor.png: Removed.
     27        * Resources/southResizeCursor.png: Removed.
     28        * Resources/southWestResizeCursor.png: Removed.
     29        * Resources/verticalTextCursor.png: Removed.
     30        * Resources/waitCursor.png: Removed.
     31        * Resources/westResizeCursor.png: Removed.
     32        * Resources/zoomInCursor.png: Removed.
     33        * Resources/zoomOutCursor.png: Removed.
     34
     35        * WebCore.xcodeproj/project.pbxproj: Removed references to the above files.
     36
     37        * platform/mac/CursorMac.mm:
     38        (WebCore::Cursor::ensurePlatformCursor): For Help, Cell, ZoomIn and ZoomOut, don’t check
     39        for a nil return value from wkCursor(), which can’t occur in any supported configuration.
     40        For None, create a cursor with an empty NSImage instead of loading a transparent image from
     41        the file system.
     42        (WebCore::createNamedCursor): Deleted.
     43
    1442014-11-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    245

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r175930 r175941  
    807807                1AB09DB416AF5F6C008538E7 /* StorageStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */; };
    808808                1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
    809                 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; };
    810                 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */; };
    811809                1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
    812810                1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
    … …  
    16051603                4643783219F720EF001E38B3 /* QuickLookMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4643783019F720EF001E38B3 /* QuickLookMac.mm */; };
    16061604                4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; };
    1607                 46BD16E30B279473001F0839 /* noneCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46BD16E20B279473001F0839 /* noneCursor.png */; };
    1608                 46D4F2490AF97E810035385A /* cellCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2460AF97E810035385A /* cellCursor.png */; };
    1609                 46D4F24B0AF97E810035385A /* verticalTextCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2480AF97E810035385A /* verticalTextCursor.png */; };
    1610                 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */; };
    1611                 46F9D5DF0B0D60170028EE36 /* progressCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46F9D5DC0B0D60170028EE36 /* progressCursor.png */; };
    16121605                490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */; };
    16131606                490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */; };
    … …  
    26622655                850B41C20AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 850B41C00AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h */; };
    26632656                850B41C30AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 850B41C10AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h */; };
    2664                 85136C990AED665900F90A3D /* eastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C890AED665800F90A3D /* eastResizeCursor.png */; };
    2665                 85136C9A0AED665900F90A3D /* eastWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */; };
    2666                 85136C9B0AED665900F90A3D /* helpCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8B0AED665800F90A3D /* helpCursor.png */; };
    2667                 85136C9C0AED665900F90A3D /* linkCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8C0AED665800F90A3D /* linkCursor.png */; };
    2668                 85136C9D0AED665900F90A3D /* moveCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8D0AED665800F90A3D /* moveCursor.png */; };
    2669                 85136C9E0AED665900F90A3D /* northEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */; };
    2670                 85136C9F0AED665900F90A3D /* northEastSouthWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */; };
    2671                 85136CA00AED665900F90A3D /* northResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C900AED665900F90A3D /* northResizeCursor.png */; };
    2672                 85136CA10AED665900F90A3D /* northSouthResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C910AED665900F90A3D /* northSouthResizeCursor.png */; };
    2673                 85136CA20AED665900F90A3D /* northWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C920AED665900F90A3D /* northWestResizeCursor.png */; };
    2674                 85136CA30AED665900F90A3D /* northWestSouthEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */; };
    2675                 85136CA40AED665900F90A3D /* southEastResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C940AED665900F90A3D /* southEastResizeCursor.png */; };
    2676                 85136CA50AED665900F90A3D /* southResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C950AED665900F90A3D /* southResizeCursor.png */; };
    2677                 85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C960AED665900F90A3D /* southWestResizeCursor.png */; };
    2678                 85136CA70AED665900F90A3D /* waitCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C970AED665900F90A3D /* waitCursor.png */; };
    2679                 85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C980AED665900F90A3D /* westResizeCursor.png */; };
    26802657                85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */; };
    26812658                85183B420AA6926100F19FA3 /* DOMHTMLBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85183B380AA6926100F19FA3 /* DOMHTMLBRElement.h */; };
    … …  
    77947771                1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageStrategy.cpp; sourceTree = "<group>"; };
    77957772                1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageStrategy.h; sourceTree = "<group>"; };
    7796                 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
    7797                 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; };
    77987773                1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
    77997774                1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShapeValue.cpp; path = style/ShapeValue.cpp; sourceTree = "<group>"; };
    … …  
    86898664                4643783019F720EF001E38B3 /* QuickLookMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookMac.mm; sourceTree = "<group>"; };
    86908665                4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; };
    8691                 46BD16E20B279473001F0839 /* noneCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = noneCursor.png; sourceTree = "<group>"; };
    8692                 46D4F2460AF97E810035385A /* cellCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cellCursor.png; sourceTree = "<group>"; };
    8693                 46D4F2480AF97E810035385A /* verticalTextCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = verticalTextCursor.png; sourceTree = "<group>"; };
    8694                 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aliasCursor.png; sourceTree = "<group>"; };
    8695                 46F9D5DC0B0D60170028EE36 /* progressCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progressCursor.png; sourceTree = "<group>"; };
    86968666                490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ANGLEWebKitBridge.cpp; sourceTree = "<group>"; };
    86978667                490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANGLEWebKitBridge.h; sourceTree = "<group>"; };
    … …  
    98519821                850B41C00AD9E7E700A6ED4F /* DOMNodeIteratorInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNodeIteratorInternal.h; sourceTree = "<group>"; };
    98529822                850B41C10AD9E7E700A6ED4F /* DOMTreeWalkerInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMTreeWalkerInternal.h; sourceTree = "<group>"; };
    9853                 85136C890AED665800F90A3D /* eastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eastResizeCursor.png; sourceTree = "<group>"; };
    9854                 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eastWestResizeCursor.png; sourceTree = "<group>"; };
    9855                 85136C8B0AED665800F90A3D /* helpCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpCursor.png; sourceTree = "<group>"; };
    9856                 85136C8C0AED665800F90A3D /* linkCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = linkCursor.png; sourceTree = "<group>"; };
    9857                 85136C8D0AED665800F90A3D /* moveCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = moveCursor.png; sourceTree = "<group>"; };
    9858                 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northEastResizeCursor.png; sourceTree = "<group>"; };
    9859                 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northEastSouthWestResizeCursor.png; sourceTree = "<group>"; };
    9860                 85136C900AED665900F90A3D /* northResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northResizeCursor.png; sourceTree = "<group>"; };
    9861                 85136C910AED665900F90A3D /* northSouthResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northSouthResizeCursor.png; sourceTree = "<group>"; };
    9862                 85136C920AED665900F90A3D /* northWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northWestResizeCursor.png; sourceTree = "<group>"; };
    9863                 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = northWestSouthEastResizeCursor.png; sourceTree = "<group>"; };
    9864                 85136C940AED665900F90A3D /* southEastResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southEastResizeCursor.png; sourceTree = "<group>"; };
    9865                 85136C950AED665900F90A3D /* southResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southResizeCursor.png; sourceTree = "<group>"; };
    9866                 85136C960AED665900F90A3D /* southWestResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = southWestResizeCursor.png; sourceTree = "<group>"; };
    9867                 85136C970AED665900F90A3D /* waitCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waitCursor.png; sourceTree = "<group>"; };
    9868                 85136C980AED665900F90A3D /* westResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = westResizeCursor.png; sourceTree = "<group>"; };
    98699823                85183B380AA6926100F19FA3 /* DOMHTMLBRElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBRElement.h; sourceTree = "<group>"; };
    98709824                85183B390AA6926100F19FA3 /* DOMHTMLBRElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLBRElement.mm; sourceTree = "<group>"; };
    … …  
    1487114825                                CD0DBB3E142274E600280263 /* audio */,
    1487214826                                65998A650E5F5FD3004E097A /* images */,
    14873                                 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */,
    14874                                 46D4F2460AF97E810035385A /* cellCursor.png */,
    14875                                 85136C890AED665800F90A3D /* eastResizeCursor.png */,
    14876                                 85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */,
    14877                                 85136C8B0AED665800F90A3D /* helpCursor.png */,
    1487814827                                7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */,
    1487914828                                2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */,
    14880                                 85136C8C0AED665800F90A3D /* linkCursor.png */,
    1488114829                                BCAD1808131C7A0D00990406 /* Localizable.strings */,
    1488214830                                7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
    1488314831                                93153BE114195A5700FCF5BE /* missingImage.png */,
    1488414832                                93153BD914181F7A00FCF5BE /* missingImage@2x.png */,
    14885                                 85136C8D0AED665800F90A3D /* moveCursor.png */,
    14886                                 46BD16E20B279473001F0839 /* noneCursor.png */,
    14887                                 85136C8E0AED665800F90A3D /* northEastResizeCursor.png */,
    14888                                 85136C8F0AED665900F90A3D /* northEastSouthWestResizeCursor.png */,
    14889                                 85136C900AED665900F90A3D /* northResizeCursor.png */,
    14890                                 85136C910AED665900F90A3D /* northSouthResizeCursor.png */,
    14891                                 85136C920AED665900F90A3D /* northWestResizeCursor.png */,
    14892                                 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */,
    1489314833                                713E70AF1733E8B300A22D00 /* plugIns.js */,
    14894                                 46F9D5DC0B0D60170028EE36 /* progressCursor.png */,
    14895                                 85136C940AED665900F90A3D /* southEastResizeCursor.png */,
    14896                                 85136C950AED665900F90A3D /* southResizeCursor.png */,
    14897                                 85136C960AED665900F90A3D /* southWestResizeCursor.png */,
    1489814834                                93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */,
    1489914835                                9370918C1416D86B00477333 /* textAreaResizeCorner@2x.png */,
    14900                                 46D4F2480AF97E810035385A /* verticalTextCursor.png */,
    14901                                 85136C970AED665900F90A3D /* waitCursor.png */,
    14902                                 85136C980AED665900F90A3D /* westResizeCursor.png */,
    14903                                 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */,
    14904                                 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */,
    1490514836                        );
    1490614837                        path = Resources;
    … …  
    2693526866                        buildActionMask = 2147483647;
    2693626867                        files = (
    26937                                 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */,
    2693826868                                1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */,
    26939                                 46D4F2490AF97E810035385A /* cellCursor.png in Resources */,
    2694026869                                D02B64B214089E56006EFA21 /* DictationPhraseWithAlternativesDot.png in Resources */,
    2694126870                                D02B64B314089E56006EFA21 /* DictationPhraseWithAlternativesDot@2x.png in Resources */,
    26942                                 85136C990AED665900F90A3D /* eastResizeCursor.png in Resources */,
    26943                                 85136C9A0AED665900F90A3D /* eastWestResizeCursor.png in Resources */,
    26944                                 85136C9B0AED665900F90A3D /* helpCursor.png in Resources */,
    2694526871                                7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */,
    2694626872                                2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
    26947                                 85136C9C0AED665900F90A3D /* linkCursor.png in Resources */,
    2694826873                                BCAD180A131C7A0D00990406 /* Localizable.strings in Resources */,
    2694926874                                311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
    … …  
    2695326878                                93153BE214195A5700FCF5BE /* missingImage.png in Resources */,
    2695426879                                93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */,
    26955                                 85136C9D0AED665900F90A3D /* moveCursor.png in Resources */,
    26956                                 46BD16E30B279473001F0839 /* noneCursor.png in Resources */,
    26957                                 85136C9E0AED665900F90A3D /* northEastResizeCursor.png in Resources */,
    26958                                 85136C9F0AED665900F90A3D /* northEastSouthWestResizeCursor.png in Resources */,
    26959                                 85136CA00AED665900F90A3D /* northResizeCursor.png in Resources */,
    26960                                 85136CA10AED665900F90A3D /* northSouthResizeCursor.png in Resources */,
    26961                                 85136CA20AED665900F90A3D /* northWestResizeCursor.png in Resources */,
    26962                                 85136CA30AED665900F90A3D /* northWestSouthEastResizeCursor.png in Resources */,
    26963                                 46F9D5DF0B0D60170028EE36 /* progressCursor.png in Resources */,
    26964                                 85136CA40AED665900F90A3D /* southEastResizeCursor.png in Resources */,
    2696526880                                7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */,
    26966                                 85136CA50AED665900F90A3D /* southResizeCursor.png in Resources */,
    26967                                 85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */,
    2696826881                                BE8C753110681324001E93F5 /* SpellingDot.png in Resources */,
    2696926882                                01E6C2E41194B2820050821C /* SpellingDot@2x.png in Resources */,
    2697026883                                93153BDC141959BC00FCF5BE /* textAreaResizeCorner.png in Resources */,
    2697126884                                9370918D1416D86B00477333 /* textAreaResizeCorner@2x.png in Resources */,
    26972                                 46D4F24B0AF97E810035385A /* verticalTextCursor.png in Resources */,
    26973                                 85136CA70AED665900F90A3D /* waitCursor.png in Resources */,
    26974                                 85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */,
    26975                                 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */,
    26976                                 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */,
    2697726885                        );
    2697826886                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/platform/mac/CursorMac.mm

    r165676 r175941  
    5454}
    5555
    56 static RetainPtr<NSCursor> createNamedCursor(const char* name, int x, int y)
    57 {
    58     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    59     RetainPtr<NSString> resourceName = adoptNS([[NSString alloc] initWithUTF8String:name]);
    60     RetainPtr<NSImage> cursorImage = adoptNS([[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreCursorBundle class]] pathForResource:resourceName.get() ofType:@"png"]]);
    61    
    62     RetainPtr<NSCursor> cursor;
    63 
    64     if (cursorImage)
    65         cursor = adoptNS([[NSCursor alloc] initWithImage:cursorImage.get() hotSpot:NSMakePoint(x, y)]);
    66 
    67     return cursor;
    68     END_BLOCK_OBJC_EXCEPTIONS;
    69     return nil;
    70 }
    71 
    7256void Cursor::ensurePlatformCursor() const
    7357{
    … …  
    9882    case Cursor::Help:
    9983        m_platformCursor = wkCursor("Help");
    100         if (m_platformCursor)
    101             break;
    102         m_platformCursor = createNamedCursor("helpCursor", 8, 8);
    10384        break;
    10485
    … …  
    178159    case Cursor::Cell:
    179160        m_platformCursor = wkCursor("Cell");
    180         if (m_platformCursor)
    181             break;
    182         m_platformCursor = createNamedCursor("cellCursor", 7, 7);
    183161        break;
    184162
    … …  
    204182
    205183    case Cursor::None:
    206         m_platformCursor = createNamedCursor("noneCursor", 7, 7);
     184        m_platformCursor = adoptNS([[NSCursor alloc] initWithImage:adoptNS([[NSImage alloc] initWithSize:NSMakeSize(1, 1)]).get() hotSpot:NSZeroPoint]);
    207185        break;
    208186
    … …  
    213191    case Cursor::ZoomIn:
    214192        m_platformCursor = wkCursor("ZoomIn");
    215         if (m_platformCursor)
    216             break;
    217         m_platformCursor = createNamedCursor("zoomInCursor", 7, 7);
    218193        break;
    219194
    220195    case Cursor::ZoomOut:
    221196        m_platformCursor = wkCursor("ZoomOut");
    222         if (m_platformCursor)
    223             break;
    224         m_platformCursor = createNamedCursor("zoomOutCursor", 7, 7);
    225197        break;
    226198
Note: See TracChangeset for help on using the changeset viewer.