diff options
author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 06:21:43 +0000 |
---|---|---|
committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 06:21:43 +0000 |
commit | 5209d8e2e3fc95777a988503018781bd0c6f9ec2 (patch) | |
tree | 995ea052b0f6dfda09266b6a022d909b3404cb38 /printing/emf_win.cc | |
parent | d03154499968cd317de9fc722ed2b39563bf3265 (diff) | |
download | chromium_src-5209d8e2e3fc95777a988503018781bd0c6f9ec2.zip chromium_src-5209d8e2e3fc95777a988503018781bd0c6f9ec2.tar.gz chromium_src-5209d8e2e3fc95777a988503018781bd0c6f9ec2.tar.bz2 |
Revert 78859 - Unfork VectorPlatformCanvas.
Unfork VectorPlatformCanvas by making NativeMetafile know how to create an appropriate VectorPlatformDevice. This will also be useful when we have multiple NativeMetafile implemenations (each requiring a different VectorPlatformDevices).
BUG=NONE
TEST=NONE
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78662
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=78663
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78812
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=78815
Review URL: http://codereview.chromium.org/6665046
TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/6711067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/emf_win.cc')
-rw-r--r-- | printing/emf_win.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 8609c34..de652f1 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -9,7 +9,6 @@ #include "base/metrics/histogram.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "skia/ext/vector_platform_device_win.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" @@ -413,21 +412,10 @@ bool Emf::Record::SafePlayback(const XFORM* base_matrix) const { return res; } -skia::PlatformDevice* Emf::StartPageForVectorCanvas( - const gfx::Size& page_size, const gfx::Point& content_origin, - const float& scale_factor) { - if (!StartPage(page_size, content_origin, scale_factor)) - return NULL; - - return skia::VectorPlatformDeviceFactory::CreateDevice(page_size.width(), - page_size.height(), - true, hdc_); -} - bool Emf::StartPage(const gfx::Size& /*page_size*/, const gfx::Point& /*content_origin*/, const float& scale_factor) { - DCHECK_EQ(1.0f, scale_factor); // We don't support scaling here. + DCHECK_EQ(scale_factor, 1); DCHECK(hdc_); if (!hdc_) return false; |