diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-12 08:05:27 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-05-12 08:05:27 -0700 |
| commit | 555569c59ced09743507966f73d2d500c6deccec (patch) | |
| tree | 4bca3a3bcdd565b833c84eb3896f280dd50e9dda /WebKit/android/jni/PictureSet.cpp | |
| parent | 80aad5eedfe9e84cabb8540f818f7d1971ecadc3 (diff) | |
| parent | eac91fe693799401095de9338c877d188e8cb8ae (diff) | |
| download | external_webkit-555569c59ced09743507966f73d2d500c6deccec.zip external_webkit-555569c59ced09743507966f73d2d500c6deccec.tar.gz external_webkit-555569c59ced09743507966f73d2d500c6deccec.tar.bz2 | |
Merge "Switch to SkSafeUnref for better portability"
Diffstat (limited to 'WebKit/android/jni/PictureSet.cpp')
| -rw-r--r-- | WebKit/android/jni/PictureSet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/jni/PictureSet.cpp b/WebKit/android/jni/PictureSet.cpp index 55d36b4..9bd1949 100644 --- a/WebKit/android/jni/PictureSet.cpp +++ b/WebKit/android/jni/PictureSet.cpp @@ -150,7 +150,7 @@ bool PictureSet::build() } } if (tossPicture) { - working->mPicture->safeUnref(); + SkSafeUnref(working->mPicture); working->mPicture = NULL; // mark to redraw } if (working->mPicture == NULL) // may have been set to null elsewhere @@ -211,7 +211,7 @@ void PictureSet::clear() Pictures* last = mPictures.end(); for (Pictures* working = mPictures.begin(); working != last; working++) { working->mArea.setEmpty(); - working->mPicture->safeUnref(); + SkSafeUnref(working->mPicture); } mPictures.clear(); mWidth = mHeight = 0; @@ -474,7 +474,7 @@ bool PictureSet::reuseSubdivided(const SkRegion& inval) if ((working->mSplit == false || invalBounds != working->mUnsplit) && inval.contains(working->mArea) == false) continue; - working->mPicture->safeUnref(); + SkSafeUnref(working->mPicture); working->mPicture = NULL; } return true; @@ -524,7 +524,7 @@ void PictureSet::setDrawTimes(const PictureSet& src) void PictureSet::setPicture(size_t i, SkPicture* p) { - mPictures[i].mPicture->safeUnref(); + SkSafeUnref(mPictures[i].mPicture); mPictures[i].mPicture = p; mPictures[i].mEmpty = emptyPicture(p); } |