Reverting 20516.

skia/ext/bitmap_platform_device_linux.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
 
 #include "base/ref_counted.h"
 #include "skia/ext/platform_device_linux.h"
 
 typedef struct _cairo_surface cairo_surface_t;
@@ skipping 66 matching lines @@
   BitmapPlatformDevice& operator=(const BitmapPlatformDevice& other);
 
   // A stub copy constructor.  Needs to be properly implemented.
   BitmapPlatformDevice(const BitmapPlatformDevice& other);
 
   // Bitmaps aren't vector graphics.
   virtual bool IsVectorial() { return false; }
 
   // If someone wants to paint on a Cairo surface version of our
   // buffer, then give them the surface we're already using.
-  virtual cairo_surface_t* beginPlatformPaint() { return surface(); }
+  virtual cairo_t* beginPlatformPaint();
 
-  cairo_surface_t* surface() const;
+  // Loads the given transform and clipping region into the HDC. This is
+  // overridden from SkDevice.
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
 
  private:
   scoped_refptr<BitmapPlatformDeviceData> data_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_