diff options
author | Derek Sollenberger <djsollen@google.com> | 2011-02-22 14:00:57 -0500 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2011-02-22 14:36:48 -0500 |
commit | b33016812afef21c69df5ab3d5b85eab5fef7c5c (patch) | |
tree | 0f08eed2e423d84b8e8582e3e44ff759cd493a6e /WebKit/android/jni/PictureSet.cpp | |
parent | e248a68aa5529c1e5faba09893cf079b0657d898 (diff) | |
download | external_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/jni/PictureSet.cpp')
-rw-r--r-- | WebKit/android/jni/PictureSet.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebKit/android/jni/PictureSet.cpp b/WebKit/android/jni/PictureSet.cpp index 98cda23..6dafd26 100644 --- a/WebKit/android/jni/PictureSet.cpp +++ b/WebKit/android/jni/PictureSet.cpp @@ -68,7 +68,7 @@ PictureSet::~PictureSet() void PictureSet::add(const Pictures* temp) { Pictures pictureAndBounds = *temp; - pictureAndBounds.mPicture->safeRef(); + SkSafeRef(pictureAndBounds.mPicture); pictureAndBounds.mWroteElapsed = false; mPictures.append(pictureAndBounds); } @@ -80,7 +80,7 @@ void PictureSet::add(const SkRegion& area, SkPicture* picture, area.getBounds().fLeft, area.getBounds().fTop, area.getBounds().fRight, area.getBounds().fBottom, picture, elapsed, split); - picture->safeRef(); + SkSafeRef(picture); /* if nothing is drawn beneath part of the new picture, mark it as a base */ SkRegion diff = SkRegion(area); Pictures* last = mPictures.end(); @@ -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; @@ -362,7 +362,7 @@ public: return true; } - virtual void commonDrawBitmap(const SkBitmap& bitmap, + virtual void commonDrawBitmap(const SkBitmap& bitmap, const SkIRect* rect, const SkMatrix& , const SkPaint& ) { if (bitmap.width() <= 1 || bitmap.height() <= 1) return; @@ -476,7 +476,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; @@ -526,7 +526,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); } |