aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPicturePlayback.cpp
diff options
context:
space:
mode:
authorGravatar rileya@google.com <rileya@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-14 15:52:47 +0000
committerGravatar rileya@google.com <rileya@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-14 15:52:47 +0000
commit1c6307e36fd96894bd11727c995f9cf9991a7be1 (patch)
treed7c9a7a64fd064660be2f22ab4baebeccf5a2dc4 /src/core/SkPicturePlayback.cpp
parent3a8b0d82885d4309f84c00dee61f0d4431bf4688 (diff)
git-svn-id: http://skia.googlecode.com/svn/trunk@5547 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPicturePlayback.cpp')
-rw-r--r--src/core/SkPicturePlayback.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 41872f831c..cb4a83828d 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -585,13 +585,15 @@ void SkPicturePlayback::draw(SkCanvas& canvas) {
TextContainer text;
SkTDArray<void*> results;
- if (fStateTree && fBoundingHierarchy) {
+ if (NULL != fStateTree && NULL != fBoundingHierarchy) {
SkRect clipBounds;
if (canvas.getClipBounds(&clipBounds)) {
SkIRect query;
clipBounds.roundOut(&query);
fBoundingHierarchy->search(query, &results);
- if (results.count() == 0) { return; }
+ if (results.count() == 0) {
+ return;
+ }
SkTQSort<SkPictureStateTree::Draw>(
reinterpret_cast<SkPictureStateTree::Draw**>(results.begin()),
reinterpret_cast<SkPictureStateTree::Draw**>(results.end()-1));
@@ -604,7 +606,9 @@ void SkPicturePlayback::draw(SkCanvas& canvas) {
if (it.isValid()) {
uint32_t off = it.draw();
- if (off == SK_MaxU32) { return; }
+ if (off == SK_MaxU32) {
+ return;
+ }
reader.setOffset(off);
}
@@ -857,7 +861,9 @@ void SkPicturePlayback::draw(SkCanvas& canvas) {
if (it.isValid()) {
uint32_t off = it.draw();
- if (off == SK_MaxU32) { break; }
+ if (off == SK_MaxU32) {
+ break;
+ }
reader.setOffset(off);
}
}