Reverting 20516.

skia/ext/bitmap_platform_device_linux.h

Index: skia/ext/bitmap_platform_device_linux.h
===================================================================
--- skia/ext/bitmap_platform_device_linux.h	(revision 20972)
+++ skia/ext/bitmap_platform_device_linux.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -85,9 +85,11 @@
 
   // 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_;