Revert 98230 - CL removing inheritance of SkDevice from PlatformDevice.

skia/ext/bitmap_platform_device_linux.h

 // 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.
 
 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "skia/ext/platform_device.h"
+#include "skia/ext/platform_device_linux.h"
 
 typedef struct _cairo_surface cairo_surface_t;
 
 // -----------------------------------------------------------------------------
 // Image byte ordering on Linux:
 //
 // Pixels are packed into 32-bit words these days. Even for 24-bit images,
 // often 8-bits will be left unused for alignment reasons. Thus, when you see
 // ARGB as the byte order you have to wonder if that's in memory order or
 // little-endian order. Here I'll write A.R.G.B to specifiy the memory order.
@@ skipping 27 matching lines @@
 // to store the backing buffer. This buffer is BGRA in memory (on little-endian
 // machines).
 //
 // For now we are also using Cairo to paint to the Drawables so we provide an
 // accessor for getting the surface.
 //
 // This is all quite ok for test_shell. In the future we will want to use
 // shared memory between the renderer and the main process at least. In this
 // case we'll probably create the buffer from a precreated region of memory.
 // -----------------------------------------------------------------------------
-class BitmapPlatformDevice : public PlatformDevice, public SkDevice {
+class BitmapPlatformDevice : public PlatformDevice {
   // A reference counted cairo surface
   class BitmapPlatformDeviceData;
 
  public:
   // Create a BitmapPlatformDeviceLinux from an already constructed bitmap;
   // you should probably be using Create(). This may become private later if
   // we ever have to share state between some native drawing UI and Skia, like
   // the Windows and Mac versions of this class do.
   //
   // This object takes ownership of @data.
   BitmapPlatformDevice(const SkBitmap& other, BitmapPlatformDeviceData* data);
   virtual ~BitmapPlatformDevice();
 
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque);
 
   // This doesn't take ownership of |data|
-  static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
-                                      uint8_t* data);
+  static BitmapPlatformDevice* Create(int width, int height,
+                                      bool is_opaque, uint8_t* data);
 
-  virtual void MakeOpaque(int x, int y, int width, int height) OVERRIDE;
+  virtual void MakeOpaque(int x, int y, int width, int height);
 
   // Overridden from SkDevice:
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
-                             const SkClipStack&) OVERRIDE;
+                             const SkClipStack&);
 
   // Overridden from PlatformDevice:
-  virtual cairo_t* BeginPlatformPaint() OVERRIDE;
-  virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
-                                   const PlatformRect* src_rect) OVERRIDE;
+  virtual cairo_t* BeginPlatformPaint();
 
  protected:
   virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
-                                             int height, bool isOpaque,
-                                             Usage usage) OVERRIDE;
+                                             int height, bool isOpaque, 
+                                             Usage usage);
 
  private:
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       cairo_surface_t* surface);
 
   scoped_refptr<BitmapPlatformDeviceData> data_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_