Deleted SkImage::newShaderClamp: not used, not implemented.

src/image/SkImage_Raster.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImage_Base.h"
 #include "SkImagePriv.h"
 #include "SkBitmap.h"
@@ skipping 46 matching lines @@
     virtual void onDrawRectToRect(SkCanvas*, const SkRect*, const SkRect&, const SkPaint*) SK_OVERRIDE;
     virtual bool onReadPixels(SkBitmap*, const SkIRect&) const SK_OVERRIDE;
     virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const SK_OVERRIDE;
     virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
 
     // exposed for SkSurface_Raster via SkNewImageFromPixelRef
     SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes);
 
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
 
+    SkShader* newShader(SkShader::TileMode, SkShader::TileMode) const;

[Justin Novosad, 2014/07/02 15:31:09]

and here

[Rémi Piotaix, 2014/07/02 20:13:18]

Done.

+
 private:
     SkImage_Raster() : INHERITED(0, 0) {}
 
     SkBitmap    fBitmap;
 
     typedef SkImage_Base INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 27 matching lines @@
 SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
     : INHERITED(info.fWidth, info.fHeight)
 {
     fBitmap.setInfo(info, rowBytes);
     fBitmap.setPixelRef(pr);
     fBitmap.lockPixels();
 }
 
 SkImage_Raster::~SkImage_Raster() {}
 
+SkShader* SkImage_Raster::newShader(SkShader::TileMode tileX, SkShader::TileMode tileY) const {
+    return SkShader::CreateBitmapShader(fBitmap, tileX, tileY, NULL);
+}
+
 void SkImage_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) {
     canvas->drawBitmap(fBitmap, x, y, paint);
 }
 
 void SkImage_Raster::onDrawRectToRect(SkCanvas* canvas, const SkRect* src,
                                       const SkRect& dst, const SkPaint* paint) {
     canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
 }
 
 bool SkImage_Raster::onReadPixels(SkBitmap* dst, const SkIRect& subset) const {
@@ skipping 66 matching lines @@
 }
 
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
                                 size_t rowBytes) {
     return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
 }
 
 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
     return ((SkImage_Raster*)image)->getPixelRef();
 }