From: skia.committer@gmail.com Date: Thu, 17 Apr 2014 03:05:10 +0000 (+0000) Subject: Sanitizing source files in Housekeeper-Nightly X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~8227 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=667b98d947892cec939669bccf204ab9ed565c4e;p=platform%2Fupstream%2FlibSkiaSharp.git Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@14234 2bbb7eff-a529-9590-31e7-b0007b416f81 --- diff --git a/include/core/SkRTreePicture.h b/include/core/SkRTreePicture.h index d691111..1fe720d 100644 --- a/include/core/SkRTreePicture.h +++ b/include/core/SkRTreePicture.h @@ -11,7 +11,7 @@ #include "SkPicture.h" /** - * Subclass of SkPicture that creates an RTree acceleration structure. + * Subclass of SkPicture that creates an RTree acceleration structure. */ class SkRTreePicture : public SkPicture { public: diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 9e327ce..241175e 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -2018,7 +2018,7 @@ enum FlatFlags { kHasTypeface_FlatFlag = 0x01, kHasEffects_FlatFlag = 0x02, kHasNonDefaultPaintOptionsAndroid_FlatFlag = 0x04, - + kFlatFlagMask = 0x7, }; @@ -2060,7 +2060,7 @@ static FlatFlags unpack_paint_flags_v22(SkPaint* paint, uint32_t packed) { enum { kFilterBitmap_Flag = 0x02, kHighQualityFilterBitmap_Flag = 0x4000, - + kAll_Flags = kFilterBitmap_Flag | kHighQualityFilterBitmap_Flag }; @@ -2078,7 +2078,7 @@ static FlatFlags unpack_paint_flags_v22(SkPaint* paint, uint32_t packed) { flags &= ~kAll_Flags; // remove these (now dead) bit flags paint->setFlags(flags); - + // hinting added later. 0 in this nibble means use the default. uint32_t hinting = (packed >> 12) & 0xF; paint->setHinting(0 == hinting ? SkPaint::kNormal_Hinting : static_cast(hinting-1)); diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index aba6d69..ab2f22f 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -289,7 +289,7 @@ DEF_TEST(Paint_flattening, reporter) { const uint32_t* written = writer.getWriter32()->contiguousArray(); SkReadBuffer reader(written, writer.bytesWritten()); - + SkPaint paint2; paint2.unflatten(reader); REPORTER_ASSERT(reporter, paint2 == paint); diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index b669e15..8aedc15 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -319,7 +319,7 @@ void PictureRenderer::purgeTextures() { } uint32_t PictureRenderer::recordFlags() { - return (kNone_BBoxHierarchyType == fBBoxHierarchyType) + return (kNone_BBoxHierarchyType == fBBoxHierarchyType) ? 0 : SkPicture::kUsePathBoundsForClip_RecordingFlag; }