summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav/FindCanvas.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-02-22 14:00:57 -0500
committerDerek Sollenberger <djsollen@google.com>2011-02-22 14:36:48 -0500
commitb33016812afef21c69df5ab3d5b85eab5fef7c5c (patch)
tree0f08eed2e423d84b8e8582e3e44ff759cd493a6e /WebKit/android/nav/FindCanvas.cpp
parente248a68aa5529c1e5faba09893cf079b0657d898 (diff)
downloadexternal_webkit-b33016812afef21c69df5ab3d5b85eab5fef7c5c.zip
external_webkit-b33016812afef21c69df5ab3d5b85eab5fef7c5c.tar.gz
external_webkit-b33016812afef21c69df5ab3d5b85eab5fef7c5c.tar.bz2
Skia Merge (revision 808)
This is a companion CL to the one found in /external/skia Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa
Diffstat (limited to 'WebKit/android/nav/FindCanvas.cpp')
-rw-r--r--WebKit/android/nav/FindCanvas.cpp8
1 files changed, 4 insertions, 4 deletions
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.