Revert previous clipping rect change for Cairo to see if it fixes the build.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20516 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 22 insertions, 127 deletions

diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index a74ec83..1b061b0 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -8,33 +8,6 @@
 
 namespace skia {
 
-namespace {
-
-void LoadMatrixToContext(cairo_t* context, const SkMatrix& matrix) {
-  cairo_matrix_t cairo_matrix;
-  cairo_matrix_init(&cairo_matrix,
-                    SkScalarToFloat(matrix.getScaleX()),
-                    SkScalarToFloat(matrix.getSkewY()),
-                    SkScalarToFloat(matrix.getSkewX()),
-                    SkScalarToFloat(matrix.getScaleY()),
-                    SkScalarToFloat(matrix.getTranslateX()),
-                    SkScalarToFloat(matrix.getTranslateY()));
-  cairo_set_matrix(context, &cairo_matrix);
-}
-
-void LoadClipToContext(cairo_t* context, const SkRegion& clip) {
-  cairo_reset_clip(context);
-
-  // TODO(brettw) support non-rect clips.
-  SkIRect bounding = clip.getBounds();
-  cairo_rectangle(context, bounding.fLeft, bounding.fTop,
-                  bounding.fRight - bounding.fLeft,
-                  bounding.fBottom - bounding.fTop);
-  cairo_clip(context);
-}
-
-}  // namespace
-
 // -----------------------------------------------------------------------------
 // These objects are reference counted and own a Cairo surface. The surface is
 // the backing store for a Skia bitmap and we reference count it so that we can
@@ -44,39 +17,18 @@ void LoadClipToContext(cairo_t* context, const SkRegion& clip) {
 class BitmapPlatformDevice::BitmapPlatformDeviceData
     : public base::RefCounted<BitmapPlatformDeviceData> {
  public:
-  explicit BitmapPlatformDeviceData(cairo_surface_t* surface);
+  explicit BitmapPlatformDeviceData(cairo_surface_t* surface)
+      : surface_(surface) { }
 
-  cairo_t* GetContext();
-  cairo_surface_t* GetSurface();
-
-  // Sets the transform and clip operations. This will not update the Cairo
-  // surface, but will mark the config as dirty. The next call of LoadConfig
-  // will pick up these changes.
-  void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  cairo_surface_t* surface() const { return surface_; }
 
  protected:
-  friend class base::RefCounted<BitmapPlatformDeviceData>;
-
-  ~BitmapPlatformDeviceData();
-
-  void LoadConfig();
-
-  // The Cairo surface inside this DC.
-  cairo_t* context_;
   cairo_surface_t *const surface_;
 
-  // True when there is a transform or clip that has not been set to the
-  // surface.  The surface is retrieved for every text operation, and the
-  // transform and clip do not change as much. We can save time by not loading
-  // the clip and transform for every one.
-  bool config_dirty_;
-
-  // Translation assigned to the DC: we need to keep track of this separately
-  // so it can be updated even if the DC isn't created yet.
-  SkMatrix transform_;
-
-  // The current clipping
-  SkRegion clip_region_;
+  friend class base::RefCounted<BitmapPlatformDeviceData>;
+  ~BitmapPlatformDeviceData() {
+    cairo_surface_destroy(surface_);
+  }
 
   // Disallow copy & assign.
   BitmapPlatformDeviceData(const BitmapPlatformDeviceData&);
@@ -84,52 +36,6 @@ class BitmapPlatformDevice::BitmapPlatformDeviceData
       const BitmapPlatformDeviceData&);
 };
 
-BitmapPlatformDevice::BitmapPlatformDeviceData::BitmapPlatformDeviceData(
-    cairo_surface_t* surface)
-    : surface_(surface),
-      config_dirty_(true) {  // Want to load the config next time.
-  context_ = cairo_create(surface);
-}
-
-BitmapPlatformDevice::BitmapPlatformDeviceData::~BitmapPlatformDeviceData() {
-  cairo_destroy(context_);
-  cairo_surface_destroy(surface_);
-}
-
-cairo_t* BitmapPlatformDevice::BitmapPlatformDeviceData::GetContext() {
-  LoadConfig();
-  return context_;
-}
-
-void BitmapPlatformDevice::BitmapPlatformDeviceData::SetMatrixClip(
-    const SkMatrix& transform,
-    const SkRegion& region) {
-  transform_ = transform;
-  clip_region_ = region;
-  config_dirty_ = true;
-}
-
-cairo_surface_t*
-BitmapPlatformDevice::BitmapPlatformDeviceData::GetSurface() {
-  // TODO(brettw) this function should be removed.
-  LoadConfig();
-  return surface_;
-}
-
-void BitmapPlatformDevice::BitmapPlatformDeviceData::LoadConfig() {
-  if (!config_dirty_ || !context_)
-    return;  // Nothing to do.
-  config_dirty_ = false;
-
-  // Load the identity matrix since this is what our clip is relative to.
-  cairo_matrix_t cairo_matrix;
-  cairo_matrix_init_identity(&cairo_matrix);
-  cairo_set_matrix(context_, &cairo_matrix);
-
-  LoadClipToContext(context_, clip_region_);
-  LoadMatrixToContext(context_, transform_);
-}
-
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
@@ -192,13 +98,8 @@ BitmapPlatformDevice::BitmapPlatformDevice(
 BitmapPlatformDevice::~BitmapPlatformDevice() {
 }
 
-cairo_t* BitmapPlatformDevice::beginPlatformPaint() {
-  return data_->GetContext();
-}
-
-void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
-  data_->SetMatrixClip(transform, region);
+cairo_surface_t* BitmapPlatformDevice::surface() const {
+  return data_->surface();
 }
 
 BitmapPlatformDevice& BitmapPlatformDevice::operator=(
diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h
index eb6ffa9..a40986c 100644
--- a/skia/ext/bitmap_platform_device_linux.h
+++ b/skia/ext/bitmap_platform_device_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -85,11 +85,9 @@ class BitmapPlatformDevice : public PlatformDevice {
 
   // If someone wants to paint on a Cairo surface version of our
   // buffer, then give them the surface we're already using.
-  virtual cairo_t* beginPlatformPaint();
+  virtual cairo_surface_t* beginPlatformPaint() { return surface(); }
 
-  // Loads the given transform and clipping region into the HDC. This is
-  // overridden from SkDevice.
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  cairo_surface_t* surface() const;
 
  private:
   scoped_refptr<BitmapPlatformDeviceData> data_;
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index 7093ff1..b37792a 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -64,9 +64,6 @@ class BitmapPlatformDevice : public PlatformDevice {
   // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
   // bitmap DC is lazy created.
   virtual HDC getBitmapDC();
-
-  // Loads the given transform and clipping region into the HDC. This is
-  // overridden from SkDevice.
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
 
   virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
diff --git a/skia/ext/canvas_paint_linux.h b/skia/ext/canvas_paint_linux.h
index abb6ada..361254b 100644
--- a/skia/ext/canvas_paint_linux.h
+++ b/skia/ext/canvas_paint_linux.h
@@ -21,7 +21,7 @@ class CanvasPaintT : public T {
  public:

   // This constructor assumes the result is opaque.

   explicit CanvasPaintT(GdkEventExpose* event)

-      : context_(NULL),

+      : surface_(NULL),

         window_(event->window),

         rectangle_(event->area),

         composite_alpha_(false) {

@@ -29,7 +29,7 @@ class CanvasPaintT : public T {
   }

 

   CanvasPaintT(GdkEventExpose* event, bool opaque)

-      : context_(NULL),

+      : surface_(NULL),

         window_(event->window),

         rectangle_(event->area),

         composite_alpha_(false) {

@@ -44,8 +44,7 @@ class CanvasPaintT : public T {
       cairo_t* cr = gdk_cairo_create(window_);

       if (composite_alpha_)

         cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);

-      cairo_surface_t* source_surface = cairo_get_target(context_);

-      cairo_set_source_surface(cr, source_surface, rectangle_.x, rectangle_.y);

+      cairo_set_source_surface(cr, surface_, rectangle_.x, rectangle_.y);

       cairo_rectangle(cr, rectangle_.x, rectangle_.y,

                       rectangle_.width, rectangle_.height);

       cairo_fill(cr);

@@ -81,10 +80,10 @@ class CanvasPaintT : public T {
     // surface.

     T::translate(-SkIntToScalar(rectangle_.x), -SkIntToScalar(rectangle_.y));

 

-    context_ = T::getTopPlatformDevice().beginPlatformPaint();

+    surface_ = T::getTopPlatformDevice().beginPlatformPaint();

   }

 

-  cairo_t* context_;

+  cairo_surface_t* surface_;

   GdkWindow* window_;

   GdkRectangle rectangle_;

   // See description above setter.

diff --git a/skia/ext/platform_canvas_linux.cc b/skia/ext/platform_canvas_linux.cc
index 109b232..61e8404 100644
--- a/skia/ext/platform_canvas_linux.cc
+++ b/skia/ext/platform_canvas_linux.cc
@@ -42,7 +42,7 @@ bool PlatformCanvas::initialize(int width, int height, bool is_opaque,
   return true;
 }
 
-cairo_t* PlatformCanvas::beginPlatformPaint() {
+cairo_surface_t* PlatformCanvas::beginPlatformPaint() {
   return getTopPlatformDevice().beginPlatformPaint();
 }
 
diff --git a/skia/ext/platform_device_linux.h b/skia/ext/platform_device_linux.h
index 2a08cc8..c23a4d8 100644
--- a/skia/ext/platform_device_linux.h
+++ b/skia/ext/platform_device_linux.h
@@ -7,19 +7,19 @@
 
 #include "third_party/skia/include/core/SkDevice.h"
 
-typedef struct _cairo cairo_t;
+typedef struct _cairo_surface cairo_surface_t;
 
 namespace skia {
 
 // Blindly copying the mac hierarchy.
 class PlatformDevice : public SkDevice {
  public:
-  typedef cairo_t* PlatformSurface;
+  typedef cairo_surface_t* PlatformSurface;
 
   // Returns if the preferred rendering engine is vectorial or bitmap based.
   virtual bool IsVectorial() = 0;
 
-  virtual PlatformSurface beginPlatformPaint() = 0;
+  virtual cairo_surface_t* beginPlatformPaint() = 0;
 
  protected:
   // Forwards |bitmap| to SkDevice's constructor.