summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-03-23 14:20:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-23 14:20:35 -0700
commitc9c790097936025a3f826e25364bbb7a213a86eb (patch)
tree5aea02579f816b581f751af8ed9f6aed80deafe8 /Source/WebCore
parent216511a07e76caf0b700c194a1cb36b07ec312c0 (diff)
parent0bf51548ba11c8d43a852f8c50ceca5d97405f65 (diff)
downloadexternal_webkit-c9c790097936025a3f826e25364bbb7a213a86eb.zip
external_webkit-c9c790097936025a3f826e25364bbb7a213a86eb.tar.gz
external_webkit-c9c790097936025a3f826e25364bbb7a213a86eb.tar.bz2
Merge "Use the right opacity"
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/LayerGroup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerGroup.cpp b/Source/WebCore/platform/graphics/android/LayerGroup.cpp
index d0138cc..5d8b726 100644
--- a/Source/WebCore/platform/graphics/android/LayerGroup.cpp
+++ b/Source/WebCore/platform/graphics/android/LayerGroup.cpp
@@ -297,7 +297,7 @@ bool LayerGroup::paint(BaseTile* tile, SkCanvas* canvas)
float LayerGroup::opacity()
{
if (singleLayer())
- return getFirstLayer()->getOpacity();
+ return getFirstLayer()->drawOpacity();
return 1.0;
}