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

8 files changed, 29 insertions, 36 deletions

diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc
index 2b8fdd5..71e3c41 100644
--- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc
+++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.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.
 
@@ -109,7 +109,9 @@ void NativeViewPhotoboothWin::PaintScreenshotIntoCanvas(
          SRCCOPY);
   // Windows screws up the alpha channel on all text it draws, and so we need
   // to call makeOpaque _after_ the blit to correct for this.
-  skia::MakeOpaque(canvas->GetSkCanvas(), target_bounds);
+  skia::MakeOpaque(canvas->GetSkCanvas(), target_bounds.x(),
+                   target_bounds.y(), target_bounds.width(),
+                   target_bounds.height());
   ReleaseDC(current_hwnd_, source_dc);
   canvas->EndPlatformPaint();
 }
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();
diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_skia_win.cc
index 9adefaef..a02f6a8 100644
--- a/ui/gfx/canvas_skia_win.cc
+++ b/ui/gfx/canvas_skia_win.cc
@@ -16,7 +16,6 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/skia_util.h"
 
 namespace {
 
@@ -366,7 +365,8 @@ void CanvasSkia::DrawStringInt(const string16& text,
   // Windows will have cleared the alpha channel of the text we drew. Assume
   // we're drawing to an opaque surface, or at least the text rect area is
   // opaque.
-  skia::MakeOpaque(canvas_, gfx::SkIRectToRect(clip));
+  skia::MakeOpaque(canvas_, clip.fLeft, clip.fTop, clip.width(),
+                   clip.height());
 }
 
 void CanvasSkia::DrawStringInt(const string16& text,
@@ -431,7 +431,7 @@ void CanvasSkia::DrawStringWithHalo(const string16& text,
   // opaque. We have to do this first since pixelShouldGetHalo will check for
   // 0 to see if a pixel has been modified to transparent, and black text that
   // Windows draw will look transparent to it!
-  skia::MakeOpaque(text_canvas.sk_canvas(), gfx::Rect(size));
+  skia::MakeOpaque(text_canvas.sk_canvas(), 0, 0, size.width(), size.height());
 
   uint32_t halo_premul = SkPreMultiplyColor(halo_color);
   SkBitmap& text_bitmap = const_cast<SkBitmap&>(
diff --git a/ui/gfx/skia_util.cc b/ui/gfx/skia_util.cc
index 121f5fe..bfee378 100644
--- a/ui/gfx/skia_util.cc
+++ b/ui/gfx/skia_util.cc
@@ -31,10 +31,6 @@ gfx::Rect SkRectToRect(const SkRect& rect) {
                    static_cast<int>(rect.height()));
 }
 
-gfx::Rect SkIRectToRect(const SkIRect& rect) {
-  return gfx::Rect(rect.x(), rect.y(), rect.width(), rect.height());
-}
-
 SkShader* CreateGradientShader(int start_point,
                                int end_point,
                                SkColor start_color,
diff --git a/ui/gfx/skia_util.h b/ui/gfx/skia_util.h
index aabbb65..de7b8f4 100644
--- a/ui/gfx/skia_util.h
+++ b/ui/gfx/skia_util.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.
 
@@ -24,7 +24,6 @@ class Rect;
 UI_EXPORT SkRect RectToSkRect(const gfx::Rect& rect);
 UI_EXPORT SkIRect RectToSkIRect(const gfx::Rect& rect);
 UI_EXPORT gfx::Rect SkRectToRect(const SkRect& rect);
-UI_EXPORT gfx::Rect SkIRectToRect(const SkIRect& rect);
 
 // Creates a vertical gradient shader. The caller owns the shader.
 // Example usage to avoid leaks:
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
index 98fc9a7..3e3f2e9 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.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.
 
@@ -141,7 +141,7 @@ PP_Bool PPB_Scrollbar_Impl::PaintInternal(const gfx::Rect& rect,
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() == base::win::VERSION_XP)
-    skia::MakeOpaque(canvas, rect);
+    skia::MakeOpaque(canvas, rect.x(), rect.y(), rect.width(), rect.height());
 #endif
 
   return PP_TRUE;