commit 914a2f282318b60da05c243793056ae0664f574e
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 16 19:57:02 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 16 19:57:02 2013 +0000
tree dae794e7332721675e30372bb202e2a040866539
parent 1c711cabae03025f6732a82b28de0a51cda63a79

Compiler warning fixes for r7235



git-svn-id: http://skia.googlecode.com/svn/trunk@7237 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/PictureRenderer.cpp

diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 08f85a4..3fc143c 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -190,9 +190,9 @@
 }
 
 uint32_t PictureRenderer::recordFlags() {
-    return kNone_BBoxHierarchyType == (fBBoxHierarchyType ? 0 :
-        SkPicture::kOptimizeForClippedPlayback_RecordingFlag) |
-        SkPicture::kUsePathBoundsForClip_RecordingFlag;
+    return (kNone_BBoxHierarchyType == fBBoxHierarchyType) ? 0 :
+        (SkPicture::kOptimizeForClippedPlayback_RecordingFlag |
+         SkPicture::kUsePathBoundsForClip_RecordingFlag);
 }
 
 /**