aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-09 03:04:11 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-09 03:04:11 +0000
commite1d94437585dad1c195d7cf095f8a5a8219d196a (patch)
tree407949aea0433a8659915a05501288f7d9c3ad8d
parent506db0b7d2905c6bedba9fc5d4aeaf231a9a34ea (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14102 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkFont.h13
-rw-r--r--src/core/SkFont.cpp2
-rwxr-xr-xsrc/gpu/GrDistanceFieldTextContext.cpp2
-rw-r--r--src/record/SkRecordDraw.cpp2
-rw-r--r--tests/FontMgrTest.cpp4
5 files changed, 10 insertions, 13 deletions
diff --git a/include/core/SkFont.h b/include/core/SkFont.h
index f3fdf45169..4891926326 100644
--- a/include/core/SkFont.h
+++ b/include/core/SkFont.h
@@ -20,9 +20,9 @@ enum SkTextEncoding {
/*
1. The Hinting enum in SkPaint is gone entirely, absorbed into SkFont's flags.
-
+
2. SkPaint Flags look like this today
-
+
enum Flags {
kAntiAlias_Flag = 0x01, //!< mask to enable antialiasing
kDither_Flag = 0x04, //!< mask to enable dithering
@@ -40,7 +40,7 @@ enum SkTextEncoding {
};
SkFont would absorb these:
-
+
kFakeBoldText_Flag = 0x20, //!< mask to enable fake-bold text
kLinearText_Flag = 0x40, //!< mask to enable linear-text
kSubpixelText_Flag = 0x80, //!< mask to enable subpixel text positioning
@@ -59,10 +59,10 @@ enum SkTextEncoding {
kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text
3. Antialiasing
-
+
SkFont has a mask-type: BW, AA, LCD
SkPaint has antialias boolean
-
+
What to do if the font's mask-type disagrees with the paint?
*/
@@ -136,7 +136,7 @@ private:
enum {
kAllFlags = 0xFF,
};
-
+
SkFont(SkTypeface*, SkScalar size, SkScalar scaleX, SkScalar skewX, MaskType, uint32_t flags);
virtual ~SkFont();
@@ -148,4 +148,3 @@ private:
uint8_t fMaskType;
// uint8_t fPad;
};
-
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
index c909f04c0a..dcc2f0bf67 100644
--- a/src/core/SkFont.cpp
+++ b/src/core/SkFont.cpp
@@ -63,7 +63,7 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
if (0 == byteLength) {
return 0;
}
-
+
SkASSERT(text);
int count = 0; // fix uninitialized warning (even though the switch is complete!)
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index 1739c530dc..568f09563f 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -59,7 +59,7 @@ bool GrDistanceFieldTextContext::canDraw(const SkPaint& paint) {
return false;
}
- // rasterizers and mask filters modify alpha, which doesn't
+ // rasterizers and mask filters modify alpha, which doesn't
// translate well to distance
if (paint.getRasterizer() || paint.getMaskFilter() ||
!fContext->getTextTarget()->caps()->shaderDerivativeSupport()) {
diff --git a/src/record/SkRecordDraw.cpp b/src/record/SkRecordDraw.cpp
index 66b48a3559..4f5fecb500 100644
--- a/src/record/SkRecordDraw.cpp
+++ b/src/record/SkRecordDraw.cpp
@@ -74,5 +74,3 @@ void SkRecordDraw(const SkRecord& record, SkCanvas* canvas) {
record.visit(draw.index, draw);
}
}
-
-
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 69e2088c66..c9aa778244 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -15,7 +15,7 @@
static void test_font(skiatest::Reporter* reporter) {
uint32_t flags = 0;
SkAutoTUnref<SkFont> font(SkFont::Create(NULL, 24, SkFont::kA8_MaskType, flags));
-
+
REPORTER_ASSERT(reporter, NULL != font->getTypeface());
REPORTER_ASSERT(reporter, 24 == font->getSize());
REPORTER_ASSERT(reporter, 1 == font->getScaleX());
@@ -33,7 +33,7 @@ static void test_font(skiatest::Reporter* reporter) {
}
REPORTER_ASSERT(reporter, glyphs[0] != glyphs[1]); // 'h' != 'e'
REPORTER_ASSERT(reporter, glyphs[2] == glyphs[3]); // 'l' == 'l'
-
+
SkAutoTUnref<SkFont> newFont(font->cloneWithSize(36));
REPORTER_ASSERT(reporter, newFont.get());
REPORTER_ASSERT(reporter, font->getTypeface() == newFont->getTypeface());