Merge "Switch to SkSafeUnref for better portability"

2 files changed, 5 insertions, 5 deletions

diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index 15cce43..ac3deef 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -47,7 +47,7 @@ MatchInfo::MatchInfo() {
 }
 
 MatchInfo::~MatchInfo() {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
 }
 
 MatchInfo::MatchInfo(const MatchInfo& src) {
@@ -58,7 +58,7 @@ MatchInfo::MatchInfo(const MatchInfo& src) {
 }
 
 void MatchInfo::set(const SkRegion& region, SkPicture* pic, int layerId) {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
     m_layerId = layerId;
     m_location = region;
     m_picture = pic;
@@ -138,7 +138,7 @@ FindCanvas::~FindCanvas() {
     setBounder(NULL);
     /* Just in case getAndClear was not called. */
     delete mMatches;
-    mWorkingPicture->safeUnref();
+    SkSafeUnref(mWorkingPicture);
 }
 
 // Each version of addMatch returns a rectangle for a match.
diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp
index 25f9482..40bef1d 100644
--- a/WebKit/android/nav/SelectText.cpp
+++ b/WebKit/android/nav/SelectText.cpp
@@ -1268,8 +1268,8 @@ SelectText::SelectText()
     paint.setShader(dropGradient);
     canvas->drawRect(endDropRect, paint);
     m_endControl.endRecording();
-    fillGradient->safeUnref();
-    dropGradient->safeUnref();
+    SkSafeUnref(fillGradient);
+    SkSafeUnref(dropGradient);
     m_picture = 0;
 }