summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-26 15:07:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-26 15:07:02 -0700
commitd6f13da9ac4acbf243824fb65b2f08ae422298b0 (patch)
tree9d4eaaaf0d3914bf19d4e07267246b00d894c9f2
parentd5a63fb6d763551b31f0dd9563ccc17e4652094b (diff)
parent30ca089e04a091c4eea95d62185d120a61f0e0ba (diff)
downloadwebkit-d6f13da9ac4acbf243824fb65b2f08ae422298b0.tar.gz
am 30ca089e: Merge "Tweaks for forward compatibility"
* commit '30ca089e04a091c4eea95d62185d120a61f0e0ba': Tweaks for forward compatibility
-rw-r--r--Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
index 10643881a..c6f2d0d01 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
@@ -47,9 +47,10 @@ static int gUniqueId;
class OpacityDrawFilter : public SkDrawFilter {
public:
OpacityDrawFilter(int opacity) : m_opacity(opacity) { }
- virtual void filter(SkPaint* paint, Type)
+ virtual bool filter(SkPaint* paint, Type)
{
paint->setAlpha(m_opacity);
+ return false;
}
private:
int m_opacity;