summaryrefslogtreecommitdiffstats
path: root/skia/ext/vector_canvas_unittest.cc
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 06:02:41 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 06:02:41 +0000
commitd03154499968cd317de9fc722ed2b39563bf3265 (patch)
tree0fb574bcd9e01309badae3090af29ace9ccad5ba /skia/ext/vector_canvas_unittest.cc
parent89b5fab4ba1bdfe3a958e3b94a1860bfdeed1e3b (diff)
downloadchromium_src-d03154499968cd317de9fc722ed2b39563bf3265.zip
chromium_src-d03154499968cd317de9fc722ed2b39563bf3265.tar.gz
chromium_src-d03154499968cd317de9fc722ed2b39563bf3265.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/vector_canvas_unittest.cc')
-rw-r--r--skia/ext/vector_canvas_unittest.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 0266c81..1066c0c 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -14,6 +14,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "skia/ext/vector_canvas.h"
+#include "skia/ext/vector_platform_device.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/effects/SkDashPathEffect.h"
#include "ui/gfx/codec/png_codec.h"
@@ -386,7 +387,8 @@ class VectorCanvasTest : public ImageTest {
size_ = size;
context_ = new Context();
bitmap_ = new Bitmap(*context_, size_, size_);
- vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
+ vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
+ size_, size_, true, context_->context()));
pcanvas_ = new PlatformCanvas(size_, size_, false);
// Clear white.
@@ -452,7 +454,8 @@ TEST_F(VectorCanvasTest, Uninitialized) {
context_ = new Context();
bitmap_ = new Bitmap(*context_, size_, size_);
- vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
+ vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
+ size_, size_, true, context_->context()));
pcanvas_ = new PlatformCanvas(size_, size_, false);
// VectorCanvas default initialization is black.