Merge from gingerbread - do not merge

Change-Id: Iba2f457ca4e8ea90078d1028e1ea829b3d889285

include/core/SkDrawFilter.h

@@ -44,7 +44,7 @@ public:
      *  Called with the paint that will be used to draw the specified type.
      *  The implementation may modify the paint as they wish.
      */
-    virtual void filter(SkPaint*, Type) = 0;
+    virtual void filter(SkPaint*, Type) {}
 };
 
 #endif

include/effects/SkLayerDrawLooper.h

@@ -74,12 +74,12 @@ public:
     /**
      *  This layer will draw with the original paint, ad the specified offset
      */
-    void addLayer(SkScalar dx, SkScalar dy);
+    SkPaint* addLayer(SkScalar dx, SkScalar dy);
     
     /**
      *  This layer will with the original paint and no offset.
      */
-    void addLayer() { this->addLayer(0, 0); }
+    SkPaint* addLayer() { return this->addLayer(0, 0); }
     
     // overrides from SkDrawLooper
     virtual void init(SkCanvas*);

src/effects/SkLayerDrawLooper.cpp

@@ -37,11 +37,11 @@ SkPaint* SkLayerDrawLooper::addLayer(const LayerInfo& info) {
     return &rec->fPaint;
 }
 
-void SkLayerDrawLooper::addLayer(SkScalar dx, SkScalar dy) {
+SkPaint* SkLayerDrawLooper::addLayer(SkScalar dx, SkScalar dy) {
     LayerInfo info;
 
     info.fOffset.set(dx, dy);
-    (void)this->addLayer(info);
+    return this->addLayer(info);
 }
 
 void SkLayerDrawLooper::init(SkCanvas* canvas) {