Revert "switch GatherPixelRefs to use SkBaseDevice instead of SkBitmapDevice"

include/core/SkBitmapDevice.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
@@ skipping 55 matching lines @@
 
     virtual uint32_t getDeviceCapabilities() SK_OVERRIDE { return 0; }
 
     /** Return the width of the device (in pixels).
     */
     virtual int width() const SK_OVERRIDE { return fBitmap.width(); }
     /** Return the height of the device (in pixels).
     */
     virtual int height() const SK_OVERRIDE { return fBitmap.height(); }
 
+    /**
+     *  Return the bounds of the device in the coordinate space of the root
+     *  canvas. The root device will have its top-left at 0,0, but other devices
+     *  such as those associated with saveLayer may have a non-zero origin.
+     */
+    virtual void getGlobalBounds(SkIRect* bounds) const SK_OVERRIDE;
+
     /** Returns true if the device's bitmap's config treats every pixels as
         implicitly opaque.
     */
     virtual bool isOpaque() const SK_OVERRIDE { return fBitmap.isOpaque(); }
 
     /** Return the bitmap config of the device's pixels
     */
     virtual SkBitmap::Config config() const SK_OVERRIDE { return fBitmap.config(); }
 
     /**
@@ skipping 193 matching lines @@
     /** Causes any deferred drawing to the device to be completed.
      */
     virtual void flush() SK_OVERRIDE {}
 
     SkBitmap    fBitmap;
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif // SkBitmapDevice_DEFINED