Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: src/core/SkPaint.cpp

Issue 26495002: Update #if to #ifdef for consistency (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 8ca9880f2102353093afce027f77a28988cd5190..ea99ede665d786b222ee1d6530ae613529a7f84a 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2038,7 +2038,7 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
asint(this->getImageFilter())) {
flatFlags |= kHasEffects_FlatFlag;
}
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
if (this->getPaintOptionsAndroid() != SkPaintOptionsAndroid()) {
flatFlags |= kHasNonDefaultPaintOptionsAndroid_FlatFlag;
}
@@ -2101,7 +2101,7 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
buffer.writeFlattenable(this->getImageFilter());
buffer.writeFlattenable(this->getAnnotation());
}
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
this->getPaintOptionsAndroid().flatten(buffer);
}
@@ -2192,13 +2192,13 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
this->setImageFilter(NULL);
}
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
this->setPaintOptionsAndroid(SkPaintOptionsAndroid());
#endif
if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
SkPaintOptionsAndroid options;
options.unflatten(buffer);
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
this->setPaintOptionsAndroid(options);
#endif
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698