diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 20:33:50 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 20:33:50 +0000 |
| commit | 02875566f67fb76d9d9b56f06aef85b397d2de68 (patch) | |
| tree | 6c1c12688b8a7fc9fc1fe490fd99e37069225812 /webkit | |
| parent | 867f8912ee9ca452d4cda177d7ac5b489af14104 (diff) | |
| download | chromium_src-02875566f67fb76d9d9b56f06aef85b397d2de68.zip chromium_src-02875566f67fb76d9d9b56f06aef85b397d2de68.tar.gz chromium_src-02875566f67fb76d9d9b56f06aef85b397d2de68.tar.bz2 | |
Use Skia on Linux also
Review URL: http://codereview.chromium.org/6410
Patch from icefox.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/SConscript | 2 | ||||
| -rw-r--r-- | webkit/glue/image_decoder.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index afc4465..f1da5da 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -20,6 +20,7 @@ if env['PLATFORM'] == 'win32': input_files = [ 'webkit_glue.cc', 'weburlrequest_impl.cc', + 'image_decoder.cc', ] if env['PLATFORM'] == 'win32': @@ -48,7 +49,6 @@ if env['PLATFORM'] == 'win32': 'glue_accessibility.cc', 'glue_serialize.cc', 'glue_util.cc', - 'image_decoder.cc', 'image_resource_fetcher.cc', 'inspector_client_impl.cc', 'localized_strings.cc', diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc index b535fa1..f63b808 100644 --- a/webkit/glue/image_decoder.cc +++ b/webkit/glue/image_decoder.cc @@ -6,7 +6,7 @@ #include "webkit/glue/image_decoder.h" #pragma warning(push, 0) -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) #include "ImageSourceSkia.h" #elif defined(OS_MACOSX) #include "ImageSource.h" @@ -40,7 +40,7 @@ SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) { // but in the future we will need to replumb to get CGImageRefs (or whatever // the native type is) everywhere, directly. -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) WebCore::ImageSourceSkia source; #elif defined(OS_MACOSX) WebCore::ImageSource source; @@ -62,7 +62,7 @@ SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) { if (!frame0) return SkBitmap(); -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) return *reinterpret_cast<SkBitmap*>(frame0); #elif defined(OS_MACOSX) // BitmapImage releases automatically, but we're bypassing it so we'll need |