aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-14 13:55:06 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-14 13:55:06 +0000
commit441a0058106d459a6289c861fcbe7bf4a32306bb (patch)
treec5512954d7ff81a8a4458d7de42e121411486a60 /include
parentf7ef56d9104fc651769760df9d5f861ef36de658 (diff)
Fix r6808 fix & some compiler warnings
Diffstat (limited to 'include')
-rw-r--r--include/core/SkShader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 0ec892eedc..389be351b2 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -159,7 +159,7 @@ public:
*/
virtual void endContext();
- SkDEBUGCODE(bool setContextHasBeenCalled() const { return fInSetContext ? true : false; })
+ SkDEBUGCODE(bool setContextHasBeenCalled() const { return SkToBool(fInSetContext); })
/**
* Called for each span of the object being drawn. Your subclass should