diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-04-30 10:04:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-04-30 10:04:15 +0000 |
| commit | d7a094b3d7b51df5e122bfc0e3a7f3af1c02d7c0 (patch) | |
| tree | d7a52db5900b32294d6b1ef37500c1a8332d9310 /www/chromium/files/patch-ui__base__resource__resource_bundle.cc | |
| parent | Connect portbuilder (diff) | |
On behalf of the Chromium team, present version 11.0.696.57 (new stable version)
Patch updates from: George Liaskos
Security: 6887828f-0229-11e0-b84d-00262d5ed8ee
Diffstat (limited to 'www/chromium/files/patch-ui__base__resource__resource_bundle.cc')
| -rw-r--r-- | www/chromium/files/patch-ui__base__resource__resource_bundle.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-ui__base__resource__resource_bundle.cc b/www/chromium/files/patch-ui__base__resource__resource_bundle.cc index 9476ed53feb0..7561cd801060 100644 --- a/www/chromium/files/patch-ui__base__resource__resource_bundle.cc +++ b/www/chromium/files/patch-ui__base__resource__resource_bundle.cc @@ -1,11 +1,11 @@ ---- ui/base/resource/resource_bundle.cc.orig 2011-01-26 10:31:08.000000000 +0100 -+++ ui/base/resource/resource_bundle.cc 2011-01-30 00:45:39.000000000 +0100 -@@ -176,7 +176,7 @@ - #if defined(OS_MACOSX) - return rb.GetNSImageNamed(resource_id); - #elif defined(USE_X11) && !defined(TOOLKIT_VIEWS) -- return rb.GetPixbufNamed(resource_id); -+ return (gfx::NativeImage)rb.GetPixbufNamed(resource_id); - #else - return rb.GetBitmapNamed(resource_id); - #endif +--- ui/base/resource/resource_bundle.cc.orig 2011-04-15 11:02:03.000000000 +0300 ++++ ui/base/resource/resource_bundle.cc 2011-04-16 23:02:04.027069500 +0300 +@@ -129,7 +129,7 @@ + return *GetEmptyImage(); + } + +-#if !defined(OS_MACOSX) && !defined(OS_LINUX) ++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_FREEBSD) + // Only Mac and Linux have non-Skia native image types. All other platforms use + // Skia natively, so just use GetImageNamed(). + gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { |