Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7875 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp
index b5df2cc..9f31a05 100644
--- a/src/gpu/gl/GrGLExtensions.cpp
+++ b/src/gpu/gl/GrGLExtensions.cpp
@@ -50,7 +50,7 @@
++extensionCnt;
}
fStrings.push_back_n(extensionCnt);
-
+
int i = 0;
while (true) {
size_t length = strcspn(extensions, " ");
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index f1be64f..6fcd6ab 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -38,7 +38,7 @@
if (0 == (binding & fBindingsExported)) {
return false;
}
-
+
GrGLExtensions extensions;
if (!extensions.init(binding, this)) {
return false;
@@ -342,7 +342,7 @@
return false;
}
}
-
+
if (kDesktop_GrGLBinding == binding && glVer >= GR_GL_VER(3, 0)) {
if (NULL == fGetStringi) {
return false;
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 0fac111..84555a2 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -164,25 +164,25 @@
{ SIMHEI, "MYingHeiGB18030" },
{ SIMHEI, "MYingHeiB5HK" },
- // 新細明體
- { PMINGLIU, "PMingLiU"},
- { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
- { PMINGLIU, "MSung B5HK"},
+ // 新細明體
+ { PMINGLIU, "PMingLiU"},
+ { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+ { PMINGLIU, "MSung B5HK"},
- // 細明體
- { MINGLIU, "MingLiU"},
- { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
- { MINGLIU, "MSung B5HK"},
+ // 細明體
+ { MINGLIU, "MingLiU"},
+ { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+ { MINGLIU, "MSung B5HK"},
- // 新細明體
- { PMINGLIUHK, "PMingLiU_HKSCS"},
- { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
- { PMINGLIUHK, "MSung B5HK"},
+ // 新細明體
+ { PMINGLIUHK, "PMingLiU_HKSCS"},
+ { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+ { PMINGLIUHK, "MSung B5HK"},
- // 細明體
- { MINGLIUHK, "MingLiU_HKSCS"},
- { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
- { MINGLIUHK, "MSung B5HK"},
+ // 細明體
+ { MINGLIUHK, "MingLiU_HKSCS"},
+ { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+ { MINGLIUHK, "MSung B5HK"},
};
static const size_t kFontCount =
@@ -296,7 +296,7 @@
FcChar8* c_family;
if (FcPatternGetString(font, FC_FAMILY, 0, &c_family))
return false;
-
+
int resulting_bold;
if (FcPatternGetInteger(font, FC_WEIGHT, 0, &resulting_bold))
resulting_bold = FC_WEIGHT_NORMAL;
@@ -334,7 +334,7 @@
///////////////////////////////////////////////////////////////////////////////
-#define kMaxFontFamilyLength 1024
+#define kMaxFontFamilyLength 1024
SkFontConfigInterfaceDirect::SkFontConfigInterfaceDirect() : next_file_id_(0) {
FcInit();
@@ -345,7 +345,7 @@
bool SkFontConfigInterfaceDirect::match(const char familyName[],
SkTypeface::Style style,
- unsigned* result_filefaceid,
+ unsigned* result_filefaceid,
SkTypeface::Style* result_style) {
std::string familyStr(familyName ? familyName : "");
if (familyStr.length() > kMaxFontFamilyLength) {
@@ -356,7 +356,7 @@
// search our cache
{
- FontMatchKey key = FontMatchKey(familyStr, style);
+ FontMatchKey key = FontMatchKey(familyStr, style);
const std::map<FontMatchKey, FontMatch>::const_iterator i =
font_match_cache_.find(key);
if (i != font_match_cache_.end()) {
@@ -559,5 +559,3 @@
int fd = open(i->second.c_str(), O_RDONLY);
return (fd >= 0) ? SkNEW_ARGS(SkFDStream, (fd, true)) : NULL;
}
-
-