| Index: skia/ext/vector_canvas_win.cc
|
| diff --git a/skia/ext/vector_canvas_win.cc b/skia/ext/vector_canvas_win.cc
|
| index 3fe14b00f87889edcf29bcd8fd607ffc21b3b1f9..d58ebc5c3275bf686d8cb68896727232f699dcfb 100644
|
| --- a/skia/ext/vector_canvas_win.cc
|
| +++ b/skia/ext/vector_canvas_win.cc
|
| @@ -16,7 +16,8 @@ VectorCanvas::VectorCanvas(HDC dc, int width, int height) {
|
| }
|
|
|
| bool VectorCanvas::initialize(HDC context, int width, int height) {
|
| - SkDevice* device = createPlatformDevice(width, height, true, context);
|
| + SkDevice* device = SkVectorPlatformDeviceFactory::CreateDevice(width, height,
|
| + true, context);
|
| if (!device)
|
| return false;
|
|
|
| @@ -25,42 +26,5 @@ bool VectorCanvas::initialize(HDC context, int width, int height) {
|
| return true;
|
| }
|
|
|
| -SkDevice* VectorCanvas::createDevice(SkBitmap::Config config,
|
| - int width, int height,
|
| - bool is_opaque, bool isForLayer) {
|
| - SkASSERT(config == SkBitmap::kARGB_8888_Config);
|
| - return createPlatformDevice(width, height, is_opaque, NULL);
|
| -}
|
| -
|
| -SkDevice* VectorCanvas::createPlatformDevice(int width,
|
| - int height, bool is_opaque,
|
| - HANDLE shared_section) {
|
| - if (!is_opaque) {
|
| - // TODO(maruel): http://crbug.com/18382 When restoring a semi-transparent
|
| - // layer, i.e. merging it, we need to rasterize it because GDI doesn't
|
| - // support transparency except for AlphaBlend(). Right now, a
|
| - // BitmapPlatformDevice is created when VectorCanvas think a saveLayers()
|
| - // call is being done. The way to save a layer would be to create an
|
| - // EMF-based VectorDevice and have this device registers the drawing. When
|
| - // playing back the device into a bitmap, do it at the printer's dpi instead
|
| - // of the layout's dpi (which is much lower).
|
| - return BitmapPlatformDevice::create(width, height,
|
| - is_opaque, shared_section);
|
| - }
|
| -
|
| - // TODO(maruel): http://crbug.com/18383 Look if it would be worth to
|
| - // increase the resolution by ~10x (any worthy factor) to increase the
|
| - // rendering precision (think about printing) while using a relatively
|
| - // low dpi. This happens because we receive float as input but the GDI
|
| - // functions works with integers. The idea is to premultiply the matrix
|
| - // with this factor and multiply each SkScalar that are passed to
|
| - // SkScalarRound(value) as SkScalarRound(value * 10). Safari is already
|
| - // doing the same for text rendering.
|
| - SkASSERT(shared_section);
|
| - PlatformDevice* device = VectorPlatformDevice::create(
|
| - reinterpret_cast<HDC>(shared_section), width, height);
|
| - return device;
|
| -}
|
| -
|
| } // namespace skia
|
|
|
|
|