Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/lazy_pixel_ref_utils.cc

 // Copyright 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.
 
 #include "skia/ext/lazy_pixel_ref_utils.h"
 
 #include "skia/ext/lazy_pixel_ref.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/src/core/SkRasterClip.h"
 
 namespace skia {
 
 namespace {
@@ skipping 16 matching lines @@
           static_cast<skia::LazyPixelRef*>(pixel_ref);
       position_pixel_ref.pixel_ref_rect = rect;
       pixel_refs_->push_back(position_pixel_ref);
     }
   }
 
  private:
   std::vector<LazyPixelRefUtils::PositionLazyPixelRef>* pixel_refs_;
 };
 
-class GatherPixelRefDevice : public SkDevice {
+class GatherPixelRefDevice : public SkBitmapDevice {
  public:
   GatherPixelRefDevice(const SkBitmap& bm, LazyPixelRefSet* lazy_pixel_ref_set)
-      : SkDevice(bm), lazy_pixel_ref_set_(lazy_pixel_ref_set) {}
+      : SkBitmapDevice(bm), lazy_pixel_ref_set_(lazy_pixel_ref_set) {}
 
   virtual void clear(SkColor color) SK_OVERRIDE {}
   virtual void writePixels(const SkBitmap& bitmap,
                            int x,
                            int y,
                            SkCanvas::Config8888 config8888) SK_OVERRIDE {}
 
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE {
     SkBitmap bitmap;
     if (GetBitmapFromPaint(paint, &bitmap)) {
@@ skipping 247 matching lines @@
                             const SkPoint texs[],
                             const SkColor colors[],
                             SkXfermode* xmode,
                             const uint16_t indices[],
                             int index_count,
                             const SkPaint& paint) SK_OVERRIDE {
     GatherPixelRefDevice::drawPoints(
         draw, SkCanvas::kPolygon_PointMode, vertex_count, verts, paint);
   }
   virtual void drawDevice(const SkDraw&,
-                          SkDevice*,
+                          SkBaseDevice*,
                           int x,
                           int y,
                           const SkPaint&) SK_OVERRIDE {}
 
  protected:
   virtual bool onReadPixels(const SkBitmap& bitmap,
                             int x,
                             int y,
                             SkCanvas::Config8888 config8888) SK_OVERRIDE {
     return false;
@@ skipping 13 matching lines @@
       // of bitmaps from gradient shaders, which implement asABitmap.
       if (SkShader::kNone_GradientType == shader->asAGradient(NULL))
         return shader->asABitmap(bm, NULL, NULL);
     }
     return false;
   }
 };
 
 class NoSaveLayerCanvas : public SkCanvas {
  public:
-  NoSaveLayerCanvas(SkDevice* device) : INHERITED(device) {}
+  NoSaveLayerCanvas(SkBaseDevice* device) : INHERITED(device) {}
 
   // Turn saveLayer() into save() for speed, should not affect correctness.
   virtual int saveLayer(const SkRect* bounds,
                         const SkPaint* paint,
                         SaveFlags flags) SK_OVERRIDE {
 
     // Like SkPictureRecord, we don't want to create layers, but we do need
     // to respect the save and (possibly) its rect-clip.
     int count = this->INHERITED::save(flags);
     if (bounds) {
@@ skipping 38 matching lines @@
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   NoSaveLayerCanvas canvas(&device);
 
   canvas.clipRect(SkRect::MakeWH(picture->width(), picture->height()),
                   SkRegion::kIntersect_Op,
                   false);
   canvas.drawPicture(*picture);
 }
 
 }  // namespace skia