summaryrefslogtreecommitdiffstats
path: root/skia/ext
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-02 18:44:08 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-02 18:44:08 +0000
commit6eec19cbd0a39057cd4e520f5f6c55ca681c08ac (patch)
tree87d0731438b7e30e6a6aacd7036b328cf8d07675 /skia/ext
parented1298aed61d79956fa6391e2b330d9ac8e385b7 (diff)
downloadchromium_src-6eec19cbd0a39057cd4e520f5f6c55ca681c08ac.zip
chromium_src-6eec19cbd0a39057cd4e520f5f6c55ca681c08ac.tar.gz
chromium_src-6eec19cbd0a39057cd4e520f5f6c55ca681c08ac.tar.bz2
Fix the non-Windows builds. This makes makes the Windows code conditional on Windows.
Review URL: http://codereview.chromium.org/28318 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
-rw-r--r--skia/ext/platform_canvas_unittest.cc16
1 files changed, 16 insertions, 0 deletions
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
index 671c5cf..c70f238 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -206,7 +206,9 @@ TEST(PlatformCanvas, FillLayer) {
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
DrawNativeRect(canvas, 0, 0, 100, 100);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+#endif
}
EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
@@ -215,8 +217,10 @@ TEST(PlatformCanvas, FillLayer) {
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
kInnerW, kInnerH);
+#endif
}
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
@@ -227,8 +231,10 @@ TEST(PlatformCanvas, FillLayer) {
canvas.save();
AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
DrawNativeRect(canvas, 0, 0, 100, 100);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(
kInnerX, kInnerY, kInnerW, kInnerH);
+#endif
canvas.restore();
}
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
@@ -240,7 +246,9 @@ TEST(PlatformCanvas, FillLayer) {
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
DrawNativeRect(canvas, 0, 0, 100, 100);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+#endif
}
canvas.restore();
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
@@ -259,7 +267,9 @@ TEST(PlatformCanvas, TranslateLayer) {
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
DrawNativeRect(canvas, 0, 0, 100, 100);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+#endif
}
canvas.restore();
EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX + 1, kLayerY + 1,
@@ -272,8 +282,10 @@ TEST(PlatformCanvas, TranslateLayer) {
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
kInnerW, kInnerH);
+#endif
}
canvas.restore();
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
@@ -286,8 +298,10 @@ TEST(PlatformCanvas, TranslateLayer) {
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
canvas.translate(1, 1);
DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
kInnerW, kInnerH);
+#endif
}
canvas.restore();
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
@@ -302,8 +316,10 @@ TEST(PlatformCanvas, TranslateLayer) {
canvas.translate(1, 1);
AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
DrawNativeRect(canvas, 0, 0, 100, 100);
+#if defined(OS_WIN)
canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
kInnerW, kInnerH);
+#endif
}
canvas.restore();
EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 2, kInnerY + 2,