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

mac: Load cursor images from resource pak file instead of from the bundle.

Depends on https://bugs.webkit.org/show_bug.cgi?id=92148

Also, while I'm here, don't include the webkit .cur files on
platforms other than windows.

BUG=137588
TEST=Cursors show up fine in component builds.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148290

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

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
File webkit/glue/webkit_resources.grd (right):

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
webkit/glue/webkit_resources.grd:58: <include name="IDR_ALIAS_CURSOR"
file="../../third_party/WebKit/Source/WebCore/Resources/aliasCursor.png"
type="BINDATA" />
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]

lgtm

Can we kill GetCachedImageWithName entirely?

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
File webkit/glue/webkit_resources.grd (right):

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
webkit/glue/webkit_resources.grd:58: <include name="IDR_ALIAS_CURSOR"
file="../../third_party/WebKit/Source/WebCore/Resources/aliasCursor.png"
type="BINDATA" />
On 2012/07/24 18:50:21, Nico wrote:
> Once this is in, these files can be removed from mac_bundle_resources in
> WebCore.gyp.

They can be, or you will be doing so?

[Nico, 2012-07-24 18:55:24]

On Tue, Jul 24, 2012 at 11:53 AM,  <avi@chromium.org> wrote:
> lgtm
>
> Can we kill GetCachedImageWithName entirely?

If chrome/iOS doesn't depend on it, yes:

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm:224:
[gfx::GetCachedImageWithName(@"menu_hierarchy_arrow.pdf") retain]);
chrome/browser/ui/cocoa/browser/avatar_button_controller.mm:131:
   gfx::GetCachedImageWithName(@"otr_icon.pdf")]];
chrome/browser/ui/cocoa/notifications/balloon_controller.mm:65:
NSImage* image = gfx::GetCachedImageWithName(@"balloon_wrench.pdf");

^ Those are http://crbug.com/111101

chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:25:
EXPECT_TRUE(gfx::GetCachedImageWithName(@"product_logo_32.png") !=
nil)
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:30:
EXPECT_EQ(gfx::GetCachedImageWithName(@"product_logo_32.png"),
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:31:
gfx::GetCachedImageWithName(@"product_logo_32.png"))
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:36:
EXPECT_TRUE(gfx::GetCachedImageWithName(@"should_not.exist") == nil)
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:41:  NSImage *first
= gfx::GetCachedImageWithName(@"product_logo_32.png");
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:48:  NSImage *second
= gfx::GetCachedImageWithName(@"product_logo_32.png");
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:57:
gfx::GetCachedImageWithName(@"find_next_Template.pdf");
chrome/browser/ui/cocoa/nsimage_cache_unittest.mm:61:
gfx::GetCachedImageWithName(@"aliasCursor.png");

^ Those are just tests

I'll file a bug for this.

>
>
>
>
https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
> File webkit/glue/webkit_resources.grd (right):
>
>
https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
> webkit/glue/webkit_resources.grd:58: <include name="IDR_ALIAS_CURSOR"
> file="../../third_party/WebKit/Source/WebCore/Resources/aliasCursor.png"
> type="BINDATA" />
> On 2012/07/24 18:50:21, Nico wrote:
>>
>> Once this is in, these files can be removed from mac_bundle_resources
>
> in
>>
>> WebCore.gyp.
>
>
> They can be, or you will be doing so?

Both :-)

>
> https://chromiumcodereview.appspot.com/10817031/

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

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
File webkit/glue/webkit_resources.grd (right):

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
webkit/glue/webkit_resources.grd:59: <include name="IDR_CELL_CURSOR"
file="../../third_party/WebKit/Source/WebCore/Resources/cellCursor.png"
type="BINDATA" />
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]

Thanks!

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
File webkit/glue/webkit_resources.grd (right):

https://chromiumcodereview.appspot.com/10817031/diff/1/webkit/glue/webkit_res...
webkit/glue/webkit_resources.grd:59: <include name="IDR_CELL_CURSOR"
file="../../third_party/WebKit/Source/WebCore/Resources/cellCursor.png"
type="BINDATA" />
On 2012/07/24 19:03:22, tony wrote:
> 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.

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.

[tony, 2012-07-24 19:16:50]

On 2012/07/24 19:15:20, Nico wrote:
> 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.

That would break the bots on build.webkit.org and we could fix it in the WebKit
tree (doing a 3 sided change with a placeholder IDR_ value).

[Nico, 2012-07-24 19:18:07]

Addressed the downstream comments in this CL too. I'll wait with landing until
https://bugs.webkit.org/show_bug.cgi?id=92148 is in.

Once the CL here is in, I'll remove the pngs from mac_resource_bundle upstream.

[tony, 2012-07-24 19:20:15]

LGTM

[commit-bot: I haz the power, 2012-07-25 02:40:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/10817031/3002

[commit-bot: I haz the power, 2012-07-25 02:41:00]

Failed to apply patch for webkit/glue/webkit_resources.grd:
While running patch -p1 --forward --force;
patching file webkit/glue/webkit_resources.grd
Hunk #2 FAILED at 55.
1 out of 2 hunks FAILED -- saving rejects to file
webkit/glue/webkit_resources.grd.rej

[commit-bot: I haz the power, 2012-07-25 02:47:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/10817031/15001

[commit-bot: I haz the power, 2012-07-25 03:44:16]

Change committed as 148290