diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 22:51:50 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 22:51:50 +0000 |
commit | 16bf88e8016bf001d1e2787e08f5642f67c64d89 (patch) | |
tree | 5c7b2cf61393d947837fc3e81f987a8e5b987a53 /skia | |
parent | 68f92592f08b67bf6e3517970218dc57cfe9ea74 (diff) | |
download | chromium_src-16bf88e8016bf001d1e2787e08f5642f67c64d89.zip chromium_src-16bf88e8016bf001d1e2787e08f5642f67c64d89.tar.gz chromium_src-16bf88e8016bf001d1e2787e08f5642f67c64d89.tar.bz2 |
Revert 125473 - skia: Change MakeOpaque() function to take a gfx::Rect parameter.
BUG=100898
R=pkasting@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9581040
TBR=tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9621019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/ext/platform_canvas.cc | 13 | ||||
-rw-r--r-- | skia/ext/platform_canvas.h | 8 | ||||
-rw-r--r-- | skia/ext/platform_canvas_unittest.cc | 21 |
3 files changed, 19 insertions, 23 deletions
diff --git a/skia/ext/platform_canvas.cc b/skia/ext/platform_canvas.cc index 09a2319..f4510744 100644 --- a/skia/ext/platform_canvas.cc +++ b/skia/ext/platform_canvas.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,6 @@ #include "skia/ext/bitmap_platform_device.h" #include "third_party/skia/include/core/SkTypes.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/skia_util.h" namespace skia { @@ -82,16 +80,19 @@ static SkPMColor MakeOpaqueXfermodeProc(SkPMColor src, SkPMColor dst) { return dst | (0xFF << SK_A32_SHIFT); } -void MakeOpaque(SkCanvas* canvas, const gfx::Rect& rect) { - if (rect.IsEmpty()) +void MakeOpaque(SkCanvas* canvas, int x, int y, int width, int height) { + if (width <= 0 || height <= 0) return; + SkRect rect; + rect.setXYWH(SkIntToScalar(x), SkIntToScalar(y), + SkIntToScalar(width), SkIntToScalar(height)); SkPaint paint; // so we don't draw anything on a device that ignores xfermodes paint.setColor(0); // install our custom mode paint.setXfermode(new SkProcXfermode(MakeOpaqueXfermodeProc))->unref(); - canvas->drawRect(gfx::RectToSkRect(rect), paint); + canvas->drawRect(rect, paint); } } // namespace skia diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h index 579bedd..87e2bd2 100644 --- a/skia/ext/platform_canvas.h +++ b/skia/ext/platform_canvas.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,10 +11,6 @@ #include "skia/ext/platform_device.h" #include "third_party/skia/include/core/SkCanvas.h" -namespace gfx { -class Rect; -} - namespace skia { // This class is a specialization of the regular SkCanvas that is designed to @@ -132,7 +128,7 @@ SK_API void DrawToNativeContext(SkCanvas* canvas, PlatformSurface context, int x, int y, const PlatformRect* src_rect); // Sets the opacity of each pixel in the specified region to be opaque. -SK_API void MakeOpaque(SkCanvas* canvas, const gfx::Rect& rect); +SK_API void MakeOpaque(SkCanvas* canvas, int x, int y, int width, int height); // These calls should surround calls to platform drawing routines, the // surface returned here can be used with the native platform routines. diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc index 9cfcd66..40cdc70 100644 --- a/skia/ext/platform_canvas_unittest.cc +++ b/skia/ext/platform_canvas_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,7 +17,6 @@ #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect.h" #include "SkColor.h" @@ -243,7 +242,7 @@ TEST(PlatformCanvas, FillLayer) { LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH); DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(0, 0, 100, 100)); + MakeOpaque(&canvas, 0, 0, 100, 100); #endif } EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH)); @@ -254,7 +253,7 @@ TEST(PlatformCanvas, FillLayer) { LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH); DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kInnerX, kInnerY, kInnerW, kInnerH)); + MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH); #endif } EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH)); @@ -267,7 +266,7 @@ TEST(PlatformCanvas, FillLayer) { AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH); DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kInnerX, kInnerY, kInnerW, kInnerH)); + MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH); #endif canvas.restore(); } @@ -281,7 +280,7 @@ TEST(PlatformCanvas, FillLayer) { LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH); DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(0, 0, 100, 100)); + MakeOpaque(&canvas, 0, 0, 100, 100); #endif } canvas.restore(); @@ -302,7 +301,7 @@ TEST(PlatformCanvas, TranslateLayer) { LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH); DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(0, 0, 100, 100)); + MakeOpaque(&canvas, 0, 0, 100, 100); #endif } canvas.restore(); @@ -317,7 +316,7 @@ TEST(PlatformCanvas, TranslateLayer) { LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH); DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kInnerX, kInnerY, kInnerW, kInnerH)); + MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH); #endif } canvas.restore(); @@ -332,7 +331,7 @@ TEST(PlatformCanvas, TranslateLayer) { canvas.translate(1, 1); DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kInnerX, kInnerY, kInnerW, kInnerH)); + MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH); #endif } canvas.restore(); @@ -350,7 +349,7 @@ TEST(PlatformCanvas, TranslateLayer) { AddClip(canvas, kInnerX + 1, kInnerY + 1, kInnerW - 1, kInnerH - 1); DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kLayerX, kLayerY, kLayerW, kLayerH)); + MakeOpaque(&canvas, kLayerX, kLayerY, kLayerW, kLayerH); #endif } canvas.restore(); @@ -378,7 +377,7 @@ TEST(PlatformCanvas, TranslateLayer) { DrawNativeRect(canvas, 0, 0, 100, 100); #if defined(OS_WIN) - MakeOpaque(&canvas, gfx::Rect(kLayerX, kLayerY, kLayerW, kLayerH)); + MakeOpaque(&canvas, kLayerX, kLayerY, kLayerW, kLayerH); #endif } canvas.restore(); |