summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_module.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 03:12:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 03:12:20 +0000
commit468fec96cd171682405d30b266f71f1766396a07 (patch)
treee3dc28717fa79c7149303d1c9ec6bb8437edfbcc /chrome/browser/extensions/extension_tabs_module.cc
parentdb1faced81ea15604ca67135c5597d35269ff84a (diff)
downloadchromium_src-468fec96cd171682405d30b266f71f1766396a07.zip
chromium_src-468fec96cd171682405d30b266f71f1766396a07.tar.gz
chromium_src-468fec96cd171682405d30b266f71f1766396a07.tar.bz2
Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes
into the gfx namespace. Combine the PNGEncoder and PNGDecoder. There were separate when we had different executables for the browser and renderer, and linked the encoder only in one of them (which saved us some space used by libpng). This hasn't been the case for years, so combining them (again) makes sense. TEST=none BUG=none Review URL: http://codereview.chromium.org/243076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_module.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 12028c2..89cb48c 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/extensions/extension_tabs_module.h"
-#include "base/gfx/jpeg_codec.h"
+#include "app/gfx/codec/jpeg_codec.h"
#include "base/string_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
@@ -785,9 +785,9 @@ bool CaptureVisibleTabFunction::RunImpl() {
#endif
scoped_refptr<RefCountedBytes> jpeg_data(new RefCountedBytes);
SkAutoLockPixels screen_capture_lock(screen_capture);
- bool encoded = JPEGCodec::Encode(
+ bool encoded = gfx::JPEGCodec::Encode(
reinterpret_cast<unsigned char*>(screen_capture.getAddr32(0, 0)),
- JPEGCodec::FORMAT_BGRA, screen_capture.width(),
+ gfx::JPEGCodec::FORMAT_BGRA, screen_capture.width(),
screen_capture.height(),
static_cast<int>(screen_capture.rowBytes()), 90,
&jpeg_data->data);