skia/ext/platform_canvas_unittest.cc - Issue 7019013: Removal of dependencies on PlatformDevice classes.

Unified Diff: skia/ext/platform_canvas_unittest.cc

Issue 7019013: Removal of dependencies on PlatformDevice classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Remove unnecessary headers. Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: skia/ext/platform_canvas_unittest.cc

===================================================================

--- skia/ext/platform_canvas_unittest.cc (revision 85672)

+++ skia/ext/platform_canvas_unittest.cc (working copy)

@@ -31,7 +31,7 @@

bool VerifyRect(const PlatformCanvas& canvas,

uint32_t canvas_color, uint32_t rect_color,

int x, int y, int w, int h) {

- PlatformDevice& device = canvas.getTopPlatformDevice();

+ SkDevice& device = canvas.getTopDevice();

const SkBitmap& bitmap = device.accessBitmap(false);

SkAutoLockPixels lock(bitmap);

@@ -70,7 +70,7 @@

bool VerifyRoundedRect(const PlatformCanvas& canvas,

uint32_t canvas_color, uint32_t rect_color,

int x, int y, int w, int h) {

- PlatformDevice& device = canvas.getTopPlatformDevice();

+ PlatformDevice& device = canvas.getTopDevice();

const SkBitmap& bitmap = device.accessBitmap(false);

SkAutoLockPixels lock(bitmap);

@@ -244,7 +244,7 @@

LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);

#endif

}

EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));

@@ -255,8 +255,8 @@

LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);

DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,

- kInnerW, kInnerH);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,

+ kInnerW, kInnerH);

#endif

}

EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));

@@ -269,7 +269,7 @@

AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(

+ platform_util::MakeOpaque(&canvas.getTopDevice(),

kInnerX, kInnerY, kInnerW, kInnerH);

#endif

canvas.restore();

@@ -284,7 +284,7 @@

LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);

#endif

}

canvas.restore();

@@ -305,7 +305,7 @@

LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);

#endif

}

canvas.restore();

@@ -320,8 +320,8 @@

LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);

DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,

- kInnerW, kInnerH);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,

+ kInnerW, kInnerH);

#endif

}

canvas.restore();

@@ -336,8 +336,8 @@

canvas.translate(1, 1);

DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,

- kInnerW, kInnerH);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,

+ kInnerW, kInnerH);

#endif

}

canvas.restore();

@@ -355,8 +355,8 @@

AddClip(canvas, kInnerX + 1, kInnerY + 1, kInnerW - 1, kInnerH - 1);

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(kLayerX, kLayerY,

- kLayerW, kLayerH);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), kLayerX, kLayerY,

+ kLayerW, kLayerH);

#endif

}

canvas.restore();

@@ -384,8 +384,8 @@

DrawNativeRect(canvas, 0, 0, 100, 100);

#if defined(OS_WIN)

- canvas.getTopPlatformDevice().makeOpaque(kLayerX, kLayerY,

- kLayerW, kLayerH);

+ platform_util::MakeOpaque(&canvas.getTopDevice(), kLayerX, kLayerY,

+ kLayerW, kLayerH);

#endif

}

canvas.restore();

« skia/ext/platform_canvas.h ('K') | « skia/ext/platform_canvas_mac.cc ('k') | skia/ext/platform_canvas_win.cc » ('j') | skia/ext/platform_device.h » ('J')