Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/analysis_canvas.h

Index: skia/ext/analysis_canvas.h
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index b257b9f148fd391fa82e727ad644bf6b44657a39..fa38570926843b0c36404b089de11f6f16b22d75 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -6,8 +6,8 @@
 #define SKIA_EXT_ANALYSIS_CANVAS_H_
 
 #include "base/compiler_specific.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace skia {
@@ -58,7 +58,7 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
   int force_not_transparent_stack_level_;
 };
 
-class SK_API AnalysisDevice : public SkDevice {
+class SK_API AnalysisDevice : public SkBitmapDevice {

[vandebo (ex-Chrome), 2013/08/22 20:41:58]

Why inherit from BitmapDevice for this one?

[robertphillips, 2013/08/23 14:01:03]

The Skia patch that is about to land doesn't actually change the
SkDevice/SkBaseDevice API it just splits SkDevice into two so we can, in future
CLs, fix the SkBaseDevice API. Until the bitmap-centric nature of SkBaseDevice
is remedied I think we are stuck providing support for the full interface and,
currently, the easiest way to do that is to derived from SkBitmapDevice.

Once SkBaseDevice's interface doesn't require a bitmap AnalysisDevice should
derive from it rather than SkBitmapDevice.

[vandebo (ex-Chrome), 2013/08/23 17:10:04]

TODO here?

[robertphillips, 2013/08/26 13:11:48]

Done.

  public:
   AnalysisDevice(const SkBitmap& bitmap);
   virtual ~AnalysisDevice();
@@ -70,7 +70,7 @@ class SK_API AnalysisDevice : public SkDevice {
   void SetForceNotTransparent(bool flag);
 
  protected:
-  // SkDevice overrides.
+  // SkBaseDevice overrides.
   virtual void clear(SkColor color) OVERRIDE;
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw& draw,
@@ -143,13 +143,13 @@ class SK_API AnalysisDevice : public SkDevice {
                             int index_count,
                             const SkPaint& paint) OVERRIDE;
   virtual void drawDevice(const SkDraw& draw,
-                          SkDevice* device,
+                          SkBaseDevice* device,
                           int x,
                           int y,
                           const SkPaint& paint) OVERRIDE;
 
  private:
-  typedef SkDevice INHERITED;
+  typedef SkBitmapDevice INHERITED;
 
   bool is_forced_not_solid_;
   bool is_forced_not_transparent_;