summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-05-12 13:20:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-12 13:20:04 -0700
commit5fa3323c37a1e7731e88e9042f79f9686b151bf5 (patch)
tree4d42e4024a1ee3530e1008e6d7a59d5212926464 /WebCore
parent7c3ea1eb3b026b8c46748911c4a539d4df56942c (diff)
parent61719739938e34b0a33995d4ab72eaa4604bcf67 (diff)
downloadexternal_webkit-5fa3323c37a1e7731e88e9042f79f9686b151bf5.zip
external_webkit-5fa3323c37a1e7731e88e9042f79f9686b151bf5.tar.gz
external_webkit-5fa3323c37a1e7731e88e9042f79f9686b151bf5.tar.bz2
am 61719739: Merge "Port toward newer versions of skia."
* commit '61719739938e34b0a33995d4ab72eaa4604bcf67': Port toward newer versions of skia.
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 4ba2da0..bf60d3b 100644
--- 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);