Skia Merge (revision 808)

This is a companion CL to the one found in /external/skia

Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa

1 files changed, 5 insertions, 5 deletions

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 35979f6..db40856 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -99,7 +99,7 @@ LayerAndroid::LayerAndroid(const LayerAndroid& layer) : SkLayer(layer),
 {
     m_isFixed = layer.m_isFixed;
     m_contentsImage = layer.m_contentsImage;
-    m_contentsImage->safeRef();
+    SkSafeRef(m_contentsImage);
     m_renderLayerPos = layer.m_renderLayerPos;
     m_transform = layer.m_transform;
     m_backgroundColor = layer.m_backgroundColor;
@@ -192,8 +192,8 @@ LayerAndroid::~LayerAndroid()
     removeTexture(0);
     removeChildren();
     delete m_extra;
-    m_contentsImage->safeUnref();
-    m_recordingPicture->safeUnref();
+    SkSafeUnref(m_contentsImage);
+    SkSafeUnref(m_recordingPicture);
     m_animations.clear();
 #ifdef DEBUG_COUNT
     ClassTracker::instance()->decrement("LayerAndroid");
@@ -1052,11 +1052,11 @@ bool LayerAndroid::prepareContext(bool force)
             || (m_recordingPicture
                 && ((m_recordingPicture->width() != (int) getSize().width())
                    || (m_recordingPicture->height() != (int) getSize().height())))) {
-            m_recordingPicture->safeUnref();
+            SkSafeUnref(m_recordingPicture);
             m_recordingPicture = new SkPicture();
         }
     } else if (m_recordingPicture) {
-        m_recordingPicture->safeUnref();
+        SkSafeUnref(m_recordingPicture);
         m_recordingPicture = 0;
     }