Skia Merge (revision 1116)

Update draw looper to use the refactored skia code.

Change-Id: I1e97d57f53f05f0699371fbef12ab2ef34faad29

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 4ba2da0..e616041 100644 (file)
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -44,19 +44,12 @@ static int gUniqueId;
 class OpacityDrawFilter : public SkDrawFilter {
  public:
     OpacityDrawFilter(int opacity) : m_opacity(opacity) { }
-    virtual bool filter(SkCanvas* canvas, SkPaint* paint, Type)
+    virtual void filter(SkPaint* paint, Type)
     {
-        m_previousOpacity = paint->getAlpha();
         paint->setAlpha(m_opacity);
-        return true;
-    }
-    virtual void restore(SkCanvas* canvas, SkPaint* paint, Type)
-    {
-        paint->setAlpha(m_previousOpacity);
     }
  private:
     int m_opacity;
-    int m_previousOpacity;
 };
 
 ///////////////////////////////////////////////////////////////////////////////