Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14234 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
03f2f81054
commit
667b98d947
@ -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:
|
||||
|
@ -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<SkPaint::Hinting>(hinting-1));
|
||||
|
@ -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);
|
||||
|
@ -319,7 +319,7 @@ void PictureRenderer::purgeTextures() {
|
||||
}
|
||||
|
||||
uint32_t PictureRenderer::recordFlags() {
|
||||
return (kNone_BBoxHierarchyType == fBBoxHierarchyType)
|
||||
return (kNone_BBoxHierarchyType == fBBoxHierarchyType)
|
||||
? 0
|
||||
: SkPicture::kUsePathBoundsForClip_RecordingFlag;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user