summaryrefslogtreecommitdiffstats
path: root/webkit/glue/image_decoder.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 21:09:00 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 21:09:00 +0000
commit3e45ba94d8be022dd139b60772fe5025cfe542cf (patch)
treec017d907ed512731711653bccb3ed685b2ee6f05 /webkit/glue/image_decoder.cc
parentd7943126bb5f9ef65b6270e52420a6f1859cf7d9 (diff)
downloadchromium_src-3e45ba94d8be022dd139b60772fe5025cfe542cf.zip
chromium_src-3e45ba94d8be022dd139b60772fe5025cfe542cf.tar.gz
chromium_src-3e45ba94d8be022dd139b60772fe5025cfe542cf.tar.bz2
Show page icons on back/forward menu lists on linux.
Also fix some gtk memory warnings and enable some code for favicon fetching. Review URL: http://codereview.chromium.org/21532 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/image_decoder.cc')
-rw-r--r--webkit/glue/image_decoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc
index 946f4b3..e7abc58 100644
--- a/webkit/glue/image_decoder.cc
+++ b/webkit/glue/image_decoder.cc
@@ -49,7 +49,7 @@ SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) const {
#endif
WTF::RefPtr<WebCore::SharedBuffer> buffer(WebCore::SharedBuffer::create(
data, static_cast<int>(size)));
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
source.setData(buffer.get(), true,
WebCore::IntSize(desired_icon_size_.width(),
desired_icon_size_.height()));