am 4ce956cc: am 3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc...

* commit '4ce956cc43762bec0962eae9707369b235c354a2':
  DO NOT MERGE-Move check for pending style recalc

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index ef500c4..4e3f55d 100644 (file)
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -50,6 +50,10 @@ class OpacityDrawFilter : public SkDrawFilter {
         paint->setAlpha(m_opacity);
         return true;
     }
+    virtual void filter(SkPaint* paint, Type)
+    {
+        paint->setAlpha(m_opacity);
+    }
     virtual void restore(SkCanvas* canvas, SkPaint* paint, Type)
     {
         paint->setAlpha(m_previousOpacity);