summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-09-13 13:14:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-13 13:14:46 -0700
commit866f5baf3e53d34e588845f01a3c4754814ccfda (patch)
tree20068074b0388ed4ec4cb861836fac6c7bc90903
parente581cc103d4ede2171c03cc9166ce40b8ddc5a97 (diff)
parent6fc2164684c1460da41190fce3b8ae62f8e36188 (diff)
downloadexternal_webkit-866f5baf3e53d34e588845f01a3c4754814ccfda.zip
external_webkit-866f5baf3e53d34e588845f01a3c4754814ccfda.tar.gz
external_webkit-866f5baf3e53d34e588845f01a3c4754814ccfda.tar.bz2
Merge "Paint into the right PicturePile" into jb-mr1-dev
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 9cb81e6..32a3c05 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -784,7 +784,7 @@ bool GraphicsLayerAndroid::repaint()
GraphicsLayerAndroid* replicatedLayer = static_cast<GraphicsLayerAndroid*>(replicaLayer());
if (replicatedLayer->maskLayer()) {
GraphicsLayerAndroid* mask = static_cast<GraphicsLayerAndroid*>(replicatedLayer->maskLayer());
- mask->paintContext(mask->m_contentLayer, m_contentLayerContent);
+ mask->paintContext(mask->m_contentLayer, mask->m_contentLayerContent);
}
}