SkShader::asNewEffect Refactoring

src/core/SkBitmapProcShader.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkBitmapProcShader_DEFINED
@@ skipping 12 matching lines @@
     virtual bool isOpaque() const SK_OVERRIDE;
     virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
 
     virtual size_t contextSize() const SK_OVERRIDE;
 
     static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty);
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader)
 
 #if SK_SUPPORT_GPU

[jvanverth1, 2014/06/05 17:36:31]

Given that the base class asNewEffect() definition isn't protected by this #if,
you can probably remove it, and similar ones. 

[dandov, 2014/06/06 21:50:43]

I didn't change this because I wanted to first test if everything worked fine
after fixing the hack. 

On 2014/06/05 17:36:31, jvanverth1 wrote:

-    GrEffectRef* asNewEffect(GrContext*, const SkPaint&, const SkMatrix*) const SK_OVERRIDE;
+    bool asNewEffect(GrContext*, const SkPaint&, GrColor*, GrEffectRef**, const SkMatrix*)
+            const SK_OVERRIDE;
 #endif
 
     class BitmapProcShaderContext : public SkShader::Context {
     public:
         // The context takes ownership of the state. It will call its destructor
         // but will NOT free the memory.
         BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*);
         virtual ~BitmapProcShaderContext();
 
         virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
@@ skipping 27 matching lines @@
 // Note that some contexts may contain other contexts (e.g. for compose shaders), but we've not
 // yet found a situation where the size below isn't big enough.
 typedef SkSmallAllocator<3, 768> SkTBlitterAllocator;
 
 // If alloc is non-NULL, it will be used to allocate the returned SkShader, and MUST outlive
 // the SkShader.
 SkShader* CreateBitmapShader(const SkBitmap& src, SkShader::TileMode, SkShader::TileMode,
                              const SkMatrix* localMatrix, SkTBlitterAllocator* alloc);
 
 #endif