Skia Merge (revision 808)

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

Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa

2 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/android/plugins/ANPTypefaceInterface.cpp b/WebKit/android/plugins/ANPTypefaceInterface.cpp
index 4b2dda2..99734a7 100644
--- a/WebKit/android/plugins/ANPTypefaceInterface.cpp
+++ b/WebKit/android/plugins/ANPTypefaceInterface.cpp
@@ -46,11 +46,11 @@ static int32_t anp_getRefCount(const ANPTypeface* tf) {
 }
 
 static void anp_ref(ANPTypeface* tf) {
-    tf->safeRef();
+    SkSafeRef(tf);
 }
 
 static void anp_unref(ANPTypeface* tf) {
-    tf->safeUnref();
+    SkSafeUnref(tf);
 }
 
 static ANPTypefaceStyle anp_getStyle(const ANPTypeface* tf) {
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index be89a68..d7d4fa7 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -95,7 +95,7 @@ PluginWidgetAndroid::~PluginWidgetAndroid() {
         env->DeleteGlobalRef(m_embeddedView);
     }
 
-    m_flipPixelRef->safeUnref();
+    SkSafeUnref(m_flipPixelRef);
 
     if (m_layer)
         m_layer->unref();
@@ -148,7 +148,7 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) {
     layoutSurface(boundsChanged);
 
     if (m_drawingModel != kSurface_ANPDrawingModel) {
-        m_flipPixelRef->safeUnref();
+        SkSafeUnref(m_flipPixelRef);
         m_flipPixelRef = new SkFlipPixelRef(computeConfig(isTransparent),
                                             window->width, window->height);
     }