Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/analysis_canvas.h

 // Copyright (c) 2013 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_ANALYSIS_CANVAS_H_
 #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 {
 
 class AnalysisDevice;
 
 // Does not render anything, but gathers statistics about a region
 // (specified as a clip rectangle) of an SkPicture as the picture is
 // played back through it.
 // To use: create a SkBitmap with kNo_Config, create an AnalysisDevice

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

This suggests that Bitmap is a artifact of no base class.

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

I think the comment is currently correct in that SkDevices' require a backing
bitmap - even if it is just a bogus one.

 // using that bitmap, and create an AnalysisCanvas using the device.
 // Play a picture into the canvas, and then check result.
 class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
  public:
   AnalysisCanvas(AnalysisDevice*);
   virtual ~AnalysisCanvas();
 
   // Returns true when a SkColor can be used to represent result.
   bool GetColorIfSolid(SkColor* color) const;
   bool HasText() const;
@@ skipping 20 matching lines @@
   virtual void restore() OVERRIDE;
 
  private:
   typedef SkCanvas INHERITED;
 
   int saved_stack_size_;
   int force_not_solid_stack_level_;
   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();
 
   bool GetColorIfSolid(SkColor* color) const;
   bool HasText() const;
 
   void SetForceNotSolid(bool flag);
   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,
                           SkCanvas::PointMode mode,
                           size_t count,
                           const SkPoint points[],
                           const SkPaint& paint) OVERRIDE;
   virtual void drawRect(const SkDraw& draw,
                         const SkRect& rect,
                         const SkPaint& paint) OVERRIDE;
@@ skipping 52 matching lines @@
                             SkCanvas::VertexMode vertex_mode,
                             int vertex_count,
                             const SkPoint verts[],
                             const SkPoint texs[],
                             const SkColor colors[],
                             SkXfermode* xmode,
                             const uint16_t indices[],
                             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_;
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   bool has_text_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_