aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/pdf/SkTSet.h10
-rw-r--r--src/ports/SkFontHost_fontconfig.cpp4
-rw-r--r--tests/TSetTest.cpp11
3 files changed, 12 insertions, 13 deletions
diff --git a/src/pdf/SkTSet.h b/src/pdf/SkTSet.h
index 35fdaf79c1..acf45a296b 100644
--- a/src/pdf/SkTSet.h
+++ b/src/pdf/SkTSet.h
@@ -71,7 +71,7 @@ public:
j++; // Skip one of the duplicates.
}
}
-
+
while (i < count()) {
fArrayNew->push((*fArray)[i]);
i++;
@@ -89,7 +89,7 @@ public:
validate();
#endif
return duplicates;
- }
+ }
/** Adds a new element into set and returns true if the element is already
* in this set.
@@ -113,7 +113,7 @@ public:
*/
bool isEmpty() const {
SkASSERT(fArray);
- return fArray->isEmpty();
+ return fArray->isEmpty();
}
/** Return the number of elements in the set.
@@ -130,7 +130,7 @@ public:
return fArray->bytes();
}
- /** Return the beginning of a set iterator.
+ /** Return the beginning of a set iterator.
* Elements in the iterator will be sorted ascending.
*/
const T* begin() const {
@@ -138,7 +138,7 @@ public:
return fArray->begin();
}
- /** Return the end of a set iterator.
+ /** Return the end of a set iterator.
*/
const T* end() const {
SkASSERT(fArray);
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 8c37c0969f..a07ad02ff7 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -25,7 +25,7 @@ static SkFontConfigInterface* gFontConfigInterface;
SkFontConfigInterface* SkFontConfigInterface::RefGlobal() {
SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
-
+
return SkSafeRef(gFontConfigInterface);
}
@@ -207,7 +207,7 @@ void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
// would also like other names (see SkFontDescriptor.h)
desc.serialize(stream);
-
+
// by convention, we also write out the actual sfnt data, preceeded by
// a packed-length. For now we skip that, so we just write the zero.
stream->writePackedUInt(0);
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index 65ebefcb2f..1cb9056a61 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -62,14 +62,14 @@ static void TestTSet_advanced(skiatest::Reporter* reporter) {
// Test copy constructor too.
SkTSet<int> set1 = set0;
-
+
REPORTER_ASSERT(reporter, set0.count() == set1.count());
REPORTER_ASSERT(reporter, !set1.contains(-1000));
for (int i = 0; i < COUNT; i++) {
REPORTER_ASSERT(reporter, set1.contains(f(i)));
}
-
+
// Test operator= too.
SkTSet<int> set2;
set2 = set0;
@@ -91,10 +91,10 @@ static void TestTSet_advanced(skiatest::Reporter* reporter) {
static void TestTSet_merge(skiatest::Reporter* reporter) {
SkTSet<int> set;
SkTSet<int> setOdd;
-
+
for (int i = 0; i < COUNT; i++) {
REPORTER_ASSERT(reporter, set.add(2 * i));
- REPORTER_ASSERT(reporter, setOdd.add(2 * i + 1));
+ REPORTER_ASSERT(reporter, setOdd.add(2 * i + 1));
}
// mergeInto returns the number of duplicates. Expected 0.
REPORTER_ASSERT(reporter, set.mergeInto(setOdd) == 0);
@@ -103,7 +103,7 @@ static void TestTSet_merge(skiatest::Reporter* reporter) {
// mergeInto should now find all new numbers duplicate.
REPORTER_ASSERT(reporter, set.mergeInto(setOdd) == setOdd.count());
REPORTER_ASSERT(reporter, set.count() == 2 * COUNT);
-
+
for (int i = 0; i < 2 * COUNT; i++) {
REPORTER_ASSERT(reporter, set.contains(i));
}
@@ -122,4 +122,3 @@ static void TestTSet(skiatest::Reporter* reporter) {
#include "TestClassDef.h"
DEFINE_TESTCLASS("TSet", TSetTest, TestTSet)
-