diff options
| author | kkanetkar@chromium.org <kkanetkar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 01:49:47 +0000 |
|---|---|---|
| committer | kkanetkar@chromium.org <kkanetkar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 01:49:47 +0000 |
| commit | 5ec41b8410e776699defd61afe439a7b8938fb03 (patch) | |
| tree | 9f3d6c6e032f227ca9150a62d66e1945c9c9b073 /skia/ext | |
| parent | 39af4c8aa1caa19e46dff48b1951fcad5dafb212 (diff) | |
| download | chromium_src-5ec41b8410e776699defd61afe439a7b8938fb03.zip chromium_src-5ec41b8410e776699defd61afe439a7b8938fb03.tar.gz chromium_src-5ec41b8410e776699defd61afe439a7b8938fb03.tar.bz2 | |
Revert 40951 - UpStreamimg *image_decoder_unittest. Used WebKit API's ImageDecoder to
decouple WebCore deps. Corresponding WebKit Bug 35415.
BUG=28063
TEST=Run unit tests.
Review URL: http://codereview.chromium.org/661231
TBR=yaar@chromium.org
Review URL: http://codereview.chromium.org/802001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
| -rw-r--r-- | skia/ext/vector_canvas_unittest.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 328de22..11c6f41 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -5,14 +5,14 @@ #include "config.h" #include "build/build_config.h" +#include "webkit/tools/test_shell/image_decoder_unittest.h" + #if !defined(OS_WIN) #include <unistd.h> #endif #include "PNGImageDecoder.h" -#undef LOG - #include "app/gfx/codec/png_codec.h" #include "base/command_line.h" #include "base/file_util.h" @@ -28,13 +28,6 @@ namespace { const wchar_t* const kGenerateSwitch = L"vector-canvas-generate"; -void ReadFileToVector(const FilePath& path, Vector<char>* contents) { - std::string contents_str; - file_util::ReadFileToString(path, &contents_str); - contents->resize(contents_str.size()); - memcpy(&contents->first(), contents_str.data(), contents_str.size()); -} - // Lightweight HDC management. class Context { public: |