mac: Move cursor images from the bundle into the resource pak file.

webkit/glue/webkit_resources.grd

Index: webkit/glue/webkit_resources.grd
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 149b116de22f0e5654c7892de70f11d3b93fbde9..10f3d0a1fbd48e6f7f303c83a7ea5fb52598a779 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -9,12 +9,7 @@
   </outputs>
   <release seq="1">
     <includes>
-      <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
       <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" />
-      <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
-      <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />
-      <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />
-      <include name="IDC_CURSOR_NONE" file="resources\none.cur" type="CURSOR" />
       <include name="IDR_INPUT_SPEECH" file="resources\input_speech.png" type="BINDATA" />
       <include name="IDR_INPUT_SPEECH_RECORDING" file="resources\input_speech_recording.png" type="BINDATA" />
       <include name="IDR_INPUT_SPEECH_WAITING" file="resources\input_speech_waiting.png" type="BINDATA" />
@@ -59,27 +54,63 @@
       <include name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="resources\mediaplayer_fullscreen_disabled.png" type="BINDATA" />
       <if expr="is_macosx">
         <include name="IDR_OVERHANG_PATTERN" file="resources\overhang_pattern.png" type="BINDATA" />
+
+        <include name="IDR_ALIAS_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/aliasCursor.png" type="BINDATA" />

[Nico, 2012/07/24 18:50:21]

Once this is in, these files can be removed from mac_bundle_resources in
WebCore.gyp.

[Avi (use Gerrit), 2012/07/24 18:53:17]

They can be, or you will be doing so?

+        <include name="IDR_CELL_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/cellCursor.png" type="BINDATA" />

[tony, 2012/07/24 19:03:22]

I don't think we should reference the files in WebKit here. The files won't be
in the same place in a webkit-only checkout and if they were to move upstream,
it would break the canary bots.

Instead, we should add these to the upstream Source/WebKit/chromium/WebKit.grd
file and use the header it generates.

[Nico, 2012/07/24 19:15:20]

Cool, I didn't know we had an upstream .grd file.  Done here:
https://bugs.webkit.org/show_bug.cgi?id=92148

I'm not sure it helps a ton though, because if that file changes upstream, the
IDR_ constants will still change and a roll might still our build.

+        <include name="IDR_CONTEXTMENU_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/contextMenuCursor.png" type="BINDATA" />
+        <include name="IDR_COPY_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/copyCursor.png" type="BINDATA" />
+        <include name="IDR_EAST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/eastResizeCursor.png" type="BINDATA" />
+        <include name="IDR_EASTWEST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/eastWestResizeCursor.png" type="BINDATA" />
+        <include name="IDR_HELP_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/helpCursor.png" type="BINDATA" />
+        <include name="IDR_LINK_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/linkCursor.png" type="BINDATA" />
+        <include name="IDR_MISSING_IMAGE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/missingImage.png" type="BINDATA" />
+        <include name="IDR_MOVE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/moveCursor.png" type="BINDATA" />
+        <include name="IDR_NODROP_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/noDropCursor.png" type="BINDATA" />
+        <include name="IDR_NONE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/noneCursor.png" type="BINDATA" />
+        <include name="IDR_NORTHEAST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northEastResizeCursor.png" type="BINDATA" />
+        <include name="IDR_NORTHEASTSOUTHWEST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northEastSouthWestResizeCursor.png" type="BINDATA" />
+        <include name="IDR_NORTH_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northResizeCursor.png" type="BINDATA" />
+        <include name="IDR_NORTHSOUTH_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northSouthResizeCursor.png" type="BINDATA" />
+        <include name="IDR_NORTHWEST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northWestResizeCursor.png" type="BINDATA" />
+        <include name="IDR_NORTHWESTSOUTHEAST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/northWestSouthEastResizeCursor.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/progressCursor.png" type="BINDATA" />
+        <include name="IDR_SOUTHEAST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/southEastResizeCursor.png" type="BINDATA" />
+        <include name="IDR_SOUTH_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/southResizeCursor.png" type="BINDATA" />
+        <include name="IDR_SOUTHWEST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/southWestResizeCursor.png" type="BINDATA" />
+        <include name="IDR_VERTICALTEXT_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/verticalTextCursor.png" type="BINDATA" />
+        <include name="IDR_WAIT_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/waitCursor.png" type="BINDATA" />
+        <include name="IDR_WEST_RESIZE_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/westResizeCursor.png" type="BINDATA" />
+        <include name="IDR_ZOOMIN_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/zoomInCursor.png" type="BINDATA" />
+        <include name="IDR_ZOOMOUT_CURSOR" file="../../third_party/WebKit/Source/WebCore/Resources/zoomOutCursor.png" type="BINDATA" />
       </if>
-      <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
+      <if expr="is_win">
+        <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
+        <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
+        <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />
+        <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />
+        <include name="IDC_CURSOR_NONE" file="resources\none.cur" type="CURSOR" />
+        <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
+        <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
+        <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
+        <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />
+        <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
+        <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />
+        <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />
+        <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />
+        <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />
+        <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />
+        <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" />
+        <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" />
+        <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" />
+      </if>
+
       <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
-      <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />
-      <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />
-      <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />
-      <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />
       <include name="IDR_SEARCH_CANCEL" file="resources\search_cancel.png" type="BINDATA" />
       <include name="IDR_SEARCH_CANCEL_PRESSED" file="resources\search_cancel_pressed.png" type="BINDATA" />
       <include name="IDR_SEARCH_MAGNIFIER" file="resources\search_magnifier.png" type="BINDATA" />
       <include name="IDR_SEARCH_MAGNIFIER_RESULTS" file="resources\search_magnifier_results.png" type="BINDATA" />
       <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
       <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />
-      <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" />
-      <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" />
-      <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" />
       <include name="IDR_AUTOFILL_CC_AMEX" file="resources\amex.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_DINERS" file="resources\diners.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_DISCOVER" file="resources\discover.png" type="BINDATA" />