summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-05-23 13:28:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-23 13:28:30 -0700
commit7f33cb9c658dd731469489f217b45b2316a214bc (patch)
tree872df89c05b3d8e17590c24cf8f6774cf3400852 /Source/WebCore/platform/graphics
parent55d602593a60888cfc87c244a5e3258f35bae50e (diff)
parent95b0a609fce7e73a37e01a6ad385b79fc959a529 (diff)
downloadexternal_webkit-7f33cb9c658dd731469489f217b45b2316a214bc.zip
external_webkit-7f33cb9c658dd731469489f217b45b2316a214bc.tar.gz
external_webkit-7f33cb9c658dd731469489f217b45b2316a214bc.tar.bz2
Merge "Fix crash" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics')
-rw-r--r--Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
index 182e811..b60b791 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
@@ -330,6 +330,8 @@ void LayerAndroid::removeAnimationsForKeyframes(const String& name)
// FIXME: use a real mask?
void LayerAndroid::setMaskLayer(LayerAndroid* layer)
{
+ SkSafeRef(layer);
+ SkSafeUnref(m_maskLayer);
m_maskLayer = layer;
if (layer)
m_haveClip = true;