From b33016812afef21c69df5ab3d5b85eab5fef7c5c Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Tue, 22 Feb 2011 14:00:57 -0500
Subject: Skia Merge (revision 808)

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

Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa
---
 WebKit/android/nav/FindCanvas.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'WebKit/android/nav/FindCanvas.cpp')

diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index e1bfd82..2d310b3 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -49,18 +49,18 @@ MatchInfo::MatchInfo() {
 }
 
 MatchInfo::~MatchInfo() {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
 }
 
 MatchInfo::MatchInfo(const MatchInfo& src) {
     m_layerId = src.m_layerId;
     m_location = src.m_location;
     m_picture = src.m_picture;
-    m_picture->safeRef();
+    SkSafeRef(m_picture);
 }
 
 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;
@@ -161,7 +161,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.
-- 
cgit v1.1