Remove trailing whitespace.

Also adds a presubmit to prevent adding trailing whitespace to source
code in the future.

Change-Id: I41a4df81487f6f00aa19b188f0cac6a3377efde6
Reviewed-on: https://skia-review.googlesource.com/57380
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

23 files changed, 165 insertions, 160 deletions

diff --git a/tools/add_codereview_message.py b/tools/add_codereview_message.py
index 296a894062..ea4afd845e 100755
--- a/tools/add_codereview_message.py
+++ b/tools/add_codereview_message.py
@@ -39,10 +39,10 @@ def add_codereview_message(issue, message):
           this url, or this could simply be the issue number.
       message: (string) message to add.
   """
-  # Passing None for the email and password will result in a prompt or
+  # Passing None for the email and auth_config will result in a prompt or
   # reuse of existing cached credentials.
-  my_rietveld = rietveld.Rietveld(RIETVELD_URL, email=None, password=None)
-  
+  my_rietveld = rietveld.Rietveld(RIETVELD_URL, email=None, auth_config=None)
+
   my_rietveld.add_comment(issue, message)
 
 
diff --git a/tools/bookmaker/bookmaker.cpp b/tools/bookmaker/bookmaker.cpp
index 4d0c2d9171..33feda5a35 100644
--- a/tools/bookmaker/bookmaker.cpp
+++ b/tools/bookmaker/bookmaker.cpp
@@ -67,7 +67,7 @@ static size_t count_indent(const string& text, size_t test, size_t end) {
     return test - result;
 }
 
-static void add_code(const string& text, int pos, int end, 
+static void add_code(const string& text, int pos, int end,
         size_t outIndent, size_t textIndent, string& example) {
     do {
          // fix this to move whole paragraph in, out, but preserve doc indent
@@ -86,7 +86,7 @@ static void add_code(const string& text, int pos, int end,
             pos += nextIndent;
             while ((size_t) pos < len) {
                 example += '"' == text[pos] ? "\\\"" :
-                    '\\' == text[pos] ? "\\\\" : 
+                    '\\' == text[pos] ? "\\\\" :
                     text.substr(pos, 1);
                 ++pos;
             }
@@ -121,14 +121,14 @@ void Definition::setCanonicalFiddle() {
             opPos += sizeof(operatorStr) - 1;
             if ('!' == fName[opPos]) {
                 SkASSERT('=' == fName[opPos + 1]);
-                result += "not_equal_operator"; 
+                result += "not_equal_operator";
             } else if ('=' == fName[opPos]) {
                 if ('(' == fName[opPos + 1]) {
-                    result += isMove ? "move_" : "copy_"; 
-                    result += "assignment_operator"; 
+                    result += isMove ? "move_" : "copy_";
+                    result += "assignment_operator";
                 } else {
                     SkASSERT('=' == fName[opPos + 1]);
-                    result += "equal_operator"; 
+                    result += "equal_operator";
                 }
             } else if ('[' == fName[opPos]) {
                 result += "subscript_operator";
@@ -160,7 +160,7 @@ void Definition::setCanonicalFiddle() {
                 } while (true);
                 if (base == methodName) {
                     fMethodType = Definition::MethodType::kConstructor;
-                    result += "empty_constructor"; 
+                    result += "empty_constructor";
                 } else {
                     result += fName.substr(doubleColons, fName.length() - doubleColons - 2);
                 }
@@ -171,7 +171,7 @@ void Definition::setCanonicalFiddle() {
                 } else {
                     size_t comma = fName.find(',', doubleColons);
                     if (string::npos == comma) {
-                        result += isMove ? "move_" : "copy_"; 
+                        result += isMove ? "move_" : "copy_";
                     }
                     fMethodType = Definition::MethodType::kConstructor;
                     // name them by their param types,
@@ -413,7 +413,7 @@ bool Definition::checkMethod() const {
                 return methodParser.reportError<bool>("multiple #Param with same name");
             }
             foundParam = true;
-            
+
         }
         if (!foundParam && !foundException) {
             return methodParser.reportError<bool>("no #Param found");
@@ -688,7 +688,7 @@ string Definition::methodName() const {
     return fName.substr(start, end - start);
 }
 
-bool Definition::nextMethodParam(TextParser* methodParser, const char** nextEndPtr, 
+bool Definition::nextMethodParam(TextParser* methodParser, const char** nextEndPtr,
         string* paramName) const {
     int parenCount = 0;
     TextParser::Save saveState(methodParser);
@@ -804,7 +804,7 @@ bool Definition::paramsMatch(const string& match, const string& name) const {
         }
         def.skipWhiteSpace();
         m.skipWhiteSpace();
-    } 
+    }
     return !def.eof() && ')' == def.peek() && !m.eof() && ')' == m.peek();
 }
 
@@ -866,7 +866,7 @@ const Definition* RootDefinition::find(const string& ref, AllowParens allowParen
     return result;
 }
 
-/* 
+/*
   class contains named struct, enum, enum-member, method, topic, subtopic
      everything contained by class is uniquely named
      contained names may be reused by other classes
@@ -948,8 +948,8 @@ bool BmhParser::addDefinition(const char* defStart, bool hasEnd, MarkType markTy
                         && fMaps[(int) markType].fExemplary != Exemplary::kOptional) {
                     if (string::npos == fFileName.find("undocumented")
                             && !hasExcluder) {
-                        hasExample == Exemplary::kNo ? 
-                                this->reportWarning("missing example") : 
+                        hasExample == Exemplary::kNo ?
+                                this->reportWarning("missing example") :
                                 this->reportWarning("unexpected example");
                     }
 
@@ -1005,7 +1005,7 @@ bool BmhParser::addDefinition(const char* defStart, bool hasEnd, MarkType markTy
                 definition->fContentStart = fChar;
                 definition->fName = typeNameBuilder[0];
                 Definition* parent = fParent;
-                while (parent && MarkType::kTopic != parent->fMarkType 
+                while (parent && MarkType::kTopic != parent->fMarkType
                         && MarkType::kSubtopic != parent->fMarkType) {
                     parent = parent->fParent;
                 }
@@ -1158,7 +1158,7 @@ bool BmhParser::addDefinition(const char* defStart, bool hasEnd, MarkType markTy
             break;
             // always treated as one-liners (can't detect misuse easily)
         case MarkType::kAlias:
-        case MarkType::kAnchor: 
+        case MarkType::kAnchor:
         case MarkType::kDefine:
         case MarkType::kError:
         case MarkType::kFile:
@@ -1207,7 +1207,7 @@ bool BmhParser::addDefinition(const char* defStart, bool hasEnd, MarkType markTy
                     return this->reportError<bool>("duplicate alias");
                 }
                 fAliasMap[alias] = definition;
-            } 
+            }
             break;
         case MarkType::kExternal:
             (void) this->collectExternals();  // FIXME: detect errors in external defs?
@@ -1459,7 +1459,7 @@ bool BmhParser::endTableColumn(const char* end, const char* terminator) {
     return true;
 }
 
-// FIXME: some examples may produce different output on different platforms 
+// FIXME: some examples may produce different output on different platforms
 // if the text output can be different, think of how to author that
 
 bool BmhParser::findDefinitions() {
@@ -1772,7 +1772,7 @@ string BmhParser::methodName() {
             isConstructor = true;
         }
         builder = parent->fName + "::";
-    } 
+    }
     if (isConstructor || expectOperator) {
         paren = this->strnchr(')', end) + 1;
     }
@@ -1838,7 +1838,7 @@ bool BmhParser::popParentStack(Definition* definition) {
 }
 
 TextParser::TextParser(const Definition* definition) :
-    TextParser(definition->fFileName, definition->fContentStart, definition->fContentEnd, 
+    TextParser(definition->fFileName, definition->fContentStart, definition->fContentEnd,
         definition->fLineCount) {
 }
 
@@ -1997,7 +1997,7 @@ vector<string> BmhParser::typeName(MarkType markType, bool* checkEnd) {
             this->skipNoName();
             break;
         case MarkType::kAlias:
-        case MarkType::kAnchor: 
+        case MarkType::kAnchor:
         case MarkType::kBug:  // fixme: expect number
         case MarkType::kDefine:
         case MarkType::kDefinedBy:
@@ -2365,7 +2365,7 @@ int main(int argc, char** const argv) {
             topics += count_children(*topic.second, MarkType::kSubtopic);
             topics += count_children(*topic.second, MarkType::kTopic);
         }
-        SkDebugf("topics=%d classes=%d methods=%d examples=%d\n", 
+        SkDebugf("topics=%d classes=%d methods=%d examples=%d\n",
                 bmhParser.fTopicMap.size(), bmhParser.fClassMap.size(),
                 methods, examples);
     }
diff --git a/tools/bookmaker/bookmaker.h b/tools/bookmaker/bookmaker.h
index 4cb9fea1c7..3954c6eaad 100644
--- a/tools/bookmaker/bookmaker.h
+++ b/tools/bookmaker/bookmaker.h
@@ -11,7 +11,7 @@
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 
-#include <algorithm> 
+#include <algorithm>
 #include <cmath>
 #include <cctype>
 #include <forward_list>
@@ -322,14 +322,14 @@ public:
 
     bool match(TextParser* );
 
-    char next() { 
+    char next() {
         SkASSERT(fChar < fEnd);
         char result = *fChar++;
         if ('\n' == result) {
             ++fLineCount;
             fLine = fChar;
         }
-        return result; 
+        return result;
     }
 
     char peek() const { SkASSERT(fChar < fEnd); return *fChar; }
@@ -475,14 +475,14 @@ public:
         return this->eof() || ' ' >= fChar[0];
     }
 
-    bool skipSpace() { 
-        while (' ' == this->peek()) { 
+    bool skipSpace() {
+        while (' ' == this->peek()) {
             (void) this->next();
             if (fChar >= fEnd) {
                 return false;
             }
-        } 
-        return true; 
+        }
+        return true;
     }
 
     bool skipWord(const char* word) {
@@ -500,19 +500,19 @@ public:
         return true;
     }
 
-    bool skipWhiteSpace() { 
-        while (' ' >= this->peek()) { 
+    bool skipWhiteSpace() {
+        while (' ' >= this->peek()) {
             (void) this->next();
             if (fChar >= fEnd) {
                 return false;
             }
-        } 
-        return true; 
+        }
+        return true;
     }
 
     bool startsWith(const char* str) const {
         size_t len = strlen(str);
-        ptrdiff_t lineLen = fEnd - fChar; 
+        ptrdiff_t lineLen = fEnd - fChar;
         return len <= (size_t) lineLen && 0 == strncmp(str, fChar, len);
     }
 
@@ -688,7 +688,7 @@ public:
 
     Definition() {}
 
-    Definition(const char* start, const char* end, int line, Definition* parent) 
+    Definition(const char* start, const char* end, int line, Definition* parent)
         : fStart(start)
         , fContentStart(start)
         , fContentEnd(end)
@@ -702,30 +702,30 @@ public:
         this->setParentIndex();
     }
 
-    Definition(MarkType markType, const char* start, int line, Definition* parent) 
+    Definition(MarkType markType, const char* start, int line, Definition* parent)
         : Definition(markType, start, nullptr, line, parent) {
     }
 
-    Definition(MarkType markType, const char* start, const char* end, int line, Definition* parent) 
+    Definition(MarkType markType, const char* start, const char* end, int line, Definition* parent)
         : Definition(start, end, line, parent) {
         fMarkType = markType;
-        fType = Type::kMark; 
+        fType = Type::kMark;
     }
 
-    Definition(Bracket bracket, const char* start, int lineCount, Definition* parent) 
+    Definition(Bracket bracket, const char* start, int lineCount, Definition* parent)
         : Definition(start, nullptr, lineCount, parent) {
         fBracket = bracket;
         fType = Type::kBracket;
     }
 
-    Definition(KeyWord keyWord, const char* start, const char* end, int lineCount, 
-            Definition* parent) 
+    Definition(KeyWord keyWord, const char* start, const char* end, int lineCount,
+            Definition* parent)
         : Definition(start, end, lineCount, parent) {
         fKeyWord = keyWord;
         fType = Type::kKeyWord;
     }
 
-    Definition(Punctuation punctuation, const char* start, int lineCount, Definition* parent) 
+    Definition(Punctuation punctuation, const char* start, int lineCount, Definition* parent)
         : Definition(start, nullptr, lineCount, parent) {
         fPunctuation = punctuation;
         fType = Type::kPunctuation;
@@ -870,7 +870,7 @@ public:
 
     bool methodHasReturn(const string& name, TextParser* methodParser) const;
     string methodName() const;
-    bool nextMethodParam(TextParser* methodParser, const char** nextEndPtr, 
+    bool nextMethodParam(TextParser* methodParser, const char** nextEndPtr,
                          string* paramName) const;
     bool paramsMatch(const string& fullRef, const string& name) const;
 
@@ -930,12 +930,12 @@ public:
 
     RootDefinition() {
     }
-    
+
     RootDefinition(MarkType markType, const char* start, int line, Definition* parent)
             : Definition(markType, start, line, parent) {
     }
 
-    RootDefinition(MarkType markType, const char* start, const char* end, int line, 
+    RootDefinition(MarkType markType, const char* start, const char* end, int line,
             Definition* parent) : Definition(markType, start, end,  line, parent) {
     }
 
@@ -1262,7 +1262,7 @@ public:
 #define E_O Exemplary::kOptional
 
     BmhParser() : ParserCommon()
-        , fMaps { 
+        , fMaps {
 // names without formal definitions (e.g. Column) aren't included
 // fill in other names once they're actually used
   { "",            nullptr,      MarkType::kNone,         R_Y, E_N, 0 }
@@ -1270,7 +1270,7 @@ public:
 , { "Alias",       nullptr,      MarkType::kAlias,        R_N, E_N, 0 }
 , { "Bug",         nullptr,      MarkType::kBug,          R_N, E_N, 0 }
 , { "Class",       &fClassMap,   MarkType::kClass,        R_Y, E_O, M_CSST | M(Root) }
-, { "Code",        nullptr,      MarkType::kCode,         R_O, E_N, M_CSST | M_E }      
+, { "Code",        nullptr,      MarkType::kCode,         R_O, E_N, M_CSST | M_E }
 , { "",            nullptr,      MarkType::kColumn,       R_Y, E_N, M(Row) }
 , { "",            nullptr,      MarkType::kComment,      R_N, E_N, 0 }
 , { "Const",       &fConstMap,   MarkType::kConst,        R_Y, E_N, M_E | M_ST  }
@@ -1286,7 +1286,7 @@ public:
 , { "Experimental", nullptr,     MarkType::kExperimental, R_Y, E_N, 0 }
 , { "External",    nullptr,      MarkType::kExternal,     R_Y, E_N, M(Root) }
 , { "File",        nullptr,      MarkType::kFile,         R_N, E_N, M(Track) }
-, { "Formula",     nullptr,      MarkType::kFormula,      R_O, E_N, 
+, { "Formula",     nullptr,      MarkType::kFormula,      R_O, E_N,
                                                     M(Column) | M_ST | M(Member) | M(Method) | M_D }
 , { "Function",    nullptr,      MarkType::kFunction,     R_O, E_N, M(Example) }
 , { "Height",      nullptr,      MarkType::kHeight,       R_N, E_N, M(Example) }
@@ -1408,7 +1408,7 @@ public:
         Exemplary fExemplary;  // worthy of an example
         uint64_t fParentMask;
     };
-    
+
     DefinitionMap fMaps[Last_MarkType + 1];
     forward_list<RootDefinition> fTopics;
     forward_list<Definition> fMarkup;
@@ -1754,7 +1754,7 @@ protected:
         unordered_map<string, Definition>* fInclude;
         MarkType fMarkType;
     };
-    
+
     DefinitionMap fMaps[Last_MarkType + 1];
     unordered_map<string, Definition> fIncludeMap;
     unordered_map<string, IClassDefinition> fIClassMap;
@@ -1814,7 +1814,7 @@ public:
     };
 
     struct IterState {
-        IterState (list<Definition>::iterator tIter, list<Definition>::iterator tIterEnd) 
+        IterState (list<Definition>::iterator tIter, list<Definition>::iterator tIterEnd)
             : fDefIter(tIter)
             , fDefEnd(tIterEnd) {
         }
@@ -1846,10 +1846,10 @@ public:
     void enumMembersOut(const RootDefinition* root, Definition& child);
     void enumSizeItems(const Definition& child);
     int lookupMethod(const PunctuationState punctuation, const Word word,
-            const int start, const int run, int lastWrite, 
+            const int start, const int run, int lastWrite,
             const char* data, bool hasIndirection);
     int lookupReference(const PunctuationState punctuation, const Word word,
-            const int start, const int run, int lastWrite, const char last, 
+            const int start, const int run, int lastWrite, const char last,
             const char* data);
     void methodOut(const Definition* method, const Definition& child);
     bool populate(Definition* def, ParentPair* parentPair, RootDefinition* root);
@@ -1973,7 +1973,7 @@ private:
     string linkName(const Definition* ) const;
     string linkRef(const string& leadingSpaces, const Definition*, const string& ref) const;
     void markTypeOut(Definition* );
-    void mdHeaderOut(int depth) { mdHeaderOutLF(depth, 2); } 
+    void mdHeaderOut(int depth) { mdHeaderOutLF(depth, 2); }
     void mdHeaderOutLF(int depth, int lf);
     bool parseFromFile(const char* path) override {
         return true;
@@ -1992,7 +1992,7 @@ private:
     }
 
     BmhParser::Resolvable resolvable(MarkType markType) {
-        if ((MarkType::kExample == markType 
+        if ((MarkType::kExample == markType
                 || MarkType::kFunction == markType) && fHasFiddle) {
             return BmhParser::Resolvable::kNo;
         }
diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp
index ee2b95a134..1e055db17f 100644
--- a/tools/bookmaker/includeParser.cpp
+++ b/tools/bookmaker/includeParser.cpp
@@ -94,7 +94,7 @@ void IncludeParser::addKeyword(KeyWord keyWord) {
     }
 }
 
-void IncludeParser::checkForMissingParams(const vector<string>& methodParams, 
+void IncludeParser::checkForMissingParams(const vector<string>& methodParams,
         const vector<string>& foundParams) {
     for (auto& methodParam : methodParams) {
         bool found = false;
@@ -330,7 +330,7 @@ bool IncludeParser::crossCheck(BmhParser& bmhParser) {
                         const char* savePos = firstMember.fChar;
                         firstMember.skipToNonAlphaNum();
                         const char* wordEnd = firstMember.fChar;
-                        firstMember.fChar = savePos; 
+                        firstMember.fChar = savePos;
                         const char* lastUnderscore = nullptr;
                         do {
                             if (!firstMember.skipToEndBracket('_')) {
@@ -343,7 +343,7 @@ bool IncludeParser::crossCheck(BmhParser& bmhParser) {
                         } while (firstMember.next());
                         if (lastUnderscore) {
                             ++lastUnderscore;
-                            string anonName = className + "::" + string(lastUnderscore, 
+                            string anonName = className + "::" + string(lastUnderscore,
                                     wordEnd - lastUnderscore) + 's';
                             def = root->find(anonName, RootDefinition::AllowParens::kYes);
                         }
@@ -394,7 +394,7 @@ bool IncludeParser::crossCheck(BmhParser& bmhParser) {
                     }
                     break;
                 default:
-                    SkASSERT(0);  // unhandled 
+                    SkASSERT(0);  // unhandled
                     break;
             }
         }
@@ -418,7 +418,7 @@ IClassDefinition* IncludeParser::defineClass(const Definition& includeDef,
         }
         test = test->fParent;
     }
-    className += name; 
+    className += name;
     unordered_map<string, IClassDefinition>& map = fIClassMap;
     IClassDefinition& markupDef = map[className];
     if (markupDef.fStart) {
@@ -727,7 +727,7 @@ void IncludeParser::dumpMethod(const Definition& token) {
         this->writeString("macro expands to: void toString(SkString* str) const;");
         this->writeEndTag();
         this->lf(2);
-        const char desc[] = 
+        const char desc[] =
                 "Creates string representation. The representation is read by\n"
                 "internal debugging tools. The interface and implementation may be\n"
                 "suppressed by defining SK_IGNORE_TO_STRING.";
@@ -770,7 +770,7 @@ bool IncludeParser::dumpTokens(const string& dir) {
     return true;
 }
 
-    // dump equivalent markup 
+    // dump equivalent markup
 bool IncludeParser::dumpTokens(const string& dir, const string& skClassName) {
     string fileName = dir;
     if (dir.length() && '/' != dir[dir.length() - 1]) {
@@ -1009,7 +1009,7 @@ bool IncludeParser::parseClass(Definition* includeDef, IsStruct isStruct) {
         }
         if ('{' == iter->fStart[0] && Definition::Type::kPunctuation == iter->fType) {
             break;
-        }   
+        }
     } while (static_cast<void>(iter = std::next(iter)), true);
     if (Punctuation::kLeftBrace != iter->fPunctuation) {
         return iter->reportError<bool>("expected left brace");
@@ -1109,7 +1109,7 @@ bool IncludeParser::parseComment(const string& filename, const char* start, cons
             break;
         }
         const char* lineEnd = parser.trimmedLineEnd();
-        markupDef->fTokens.emplace_back(MarkType::kComment, parser.fChar, lineEnd, 
+        markupDef->fTokens.emplace_back(MarkType::kComment, parser.fChar, lineEnd,
                 parser.fLineCount, parent);
         parser.skipToEndBracket('\n');
     }
@@ -1144,7 +1144,7 @@ bool IncludeParser::parseEnum(Definition* child, Definition* markupDef) {
     }
     const char* nameStart = enumName.fChar;
     enumName.skipToSpace();
-    markupChild->fName = markupDef->fName + "::" + 
+    markupChild->fName = markupDef->fName + "::" +
             string(nameStart, (size_t) (enumName.fChar - nameStart));
     if (!this->findComments(*child, markupChild)) {
         return false;
@@ -1435,7 +1435,7 @@ bool IncludeParser::parseObject(Definition* child, Definition* markupDef) {
     switch (child->fType) {
         case Definition::Type::kKeyWord:
             switch (child->fKeyWord) {
-                case KeyWord::kClass: 
+                case KeyWord::kClass:
                     if (!this->parseClass(child, IsStruct::kNo)) {
                         return false;
                     }
@@ -1635,7 +1635,7 @@ bool IncludeParser::parseChar() {
                     this->popBracket();
                 }
                 break;
-            } 
+            }
             if (!fInCharCommentString && '/' == fPrev) {
                 this->pushBracket(Bracket::kSlashSlash);
                 break;
@@ -1753,7 +1753,7 @@ bool IncludeParser::parseChar() {
                                 if ("SK_ATTR_EXTERNALLY_DEPRECATED" == word) {
                                     deprecatedMacro = true;
                                     // remove macro paren (would confuse method parsing later)
-                                    fParent->fTokens.pop_back();  
+                                    fParent->fTokens.pop_back();
                                     fParent->fChildren.pop_back();
                                 }
                                 break;
@@ -1949,7 +1949,7 @@ bool IncludeParser::parseChar() {
         case 'k': case 'l': case 'm': case 'n': case 'o':
         case 'p': case 'q': case 'r': case 's': case 't':
         case 'u': case 'v': case 'w': case 'x': case 'y':
-        case 'z': 
+        case 'z':
             if (fInCharCommentString || fInBrace) {
                 break;
             }
diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp
index e2215a6e1c..38213618c5 100644
--- a/tools/bookmaker/includeWriter.cpp
+++ b/tools/bookmaker/includeWriter.cpp
@@ -16,7 +16,7 @@ void IncludeWriter::descriptionOut(const Definition* def) {
             case MarkType::kDefinedBy:
                 commentStart = prop->fTerminator;
                 break;
-            case MarkType::kDeprecated: 
+            case MarkType::kDeprecated:
             case MarkType::kPrivate:
                 commentLen = (int) (prop->fStart - commentStart);
                 if (commentLen > 0) {
@@ -308,7 +308,7 @@ void IncludeWriter::enumMembersOut(const RootDefinition* root, Definition& child
                 if (' ' == lastEnd[0]) {
                     this->writeSpace();
                 }
-                this->writeBlock((int) (token->fContentEnd - lastEnd), lastEnd); 
+                this->writeBlock((int) (token->fContentEnd - lastEnd), lastEnd);
                 continue;
             }
         }
@@ -477,7 +477,7 @@ void IncludeWriter::enumSizeItems(const Definition& child) {
                     token.fContentStart, token.fLineCount);
             const char* end = valueEnd.anyOf(",}");
             if (!end) {  // write expression continuation
-                valueLen += (int) (token.fContentEnd - lastEnd); 
+                valueLen += (int) (token.fContentEnd - lastEnd);
                 continue;
             }
         }
@@ -545,7 +545,7 @@ void IncludeWriter::methodOut(const Definition* method, const Definition& child)
         int saveIndent = fIndent;
         for (auto methodPart : method->fChildren) {
             const char* partStart = methodPart->fContentStart;
-            const char* partEnd = methodPart->fContentEnd; 
+            const char* partEnd = methodPart->fContentEnd;
             if (MarkType::kParam == methodPart->fMarkType) {
                 this->writeString("@param");
                 this->writeSpace();
@@ -628,7 +628,7 @@ Definition* IncludeWriter::structMemberOut(const Definition* memberStart, const
             if (MarkType::kFormula == child->fMarkType) {
                 this->writeSpace();
                 this->writeBlock((int) (child->fContentEnd - child->fContentStart),
-                        child->fContentStart); 
+                        child->fContentStart);
             }
             commentStart = child->fTerminator;
         }
@@ -660,7 +660,7 @@ Definition* IncludeWriter::structMemberOut(const Definition* memberStart, const
         this->writeString("=");
         this->writeSpace();
         this->writeBlock((int) (valueEnd->fStart - valueStart->fContentStart),
-                valueStart->fContentStart); 
+                valueStart->fContentStart);
     }
     this->writeString(";");
     if (isShort) {
@@ -849,7 +849,7 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti
                 SkASSERT(')' == child.fContentStart[childLen]);
                 ++childLen;
                 do {
-                    TextParser params(clonedMethod->fFileName, clonedMethod->fStart, 
+                    TextParser params(clonedMethod->fFileName, clonedMethod->fStart,
                         clonedMethod->fContentStart, clonedMethod->fLineCount);
                     params.skipToEndBracket('(');
                     if (params.startsWith(child.fContentStart, childLen)) {
@@ -925,7 +925,7 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti
             }
             fLastComment = &child;
             continue;
-        } 
+        }
         if (MarkType::kMethod == child.fMarkType) {
             if (this->internalName(child)) {
                 continue;
@@ -958,7 +958,7 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti
                 fAttrDeprecated = nullptr;
             }
             continue;
-        } 
+        }
         if (Definition::Type::kKeyWord == child.fType) {
             const Definition* structDef = nullptr;
             switch (child.fKeyWord) {
@@ -1104,9 +1104,9 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti
                 }
             }
             continue;
-        } 
+        }
         if (Definition::Type::kBracket == child.fType) {
-            if (KeyWord::kEnum == child.fParent->fKeyWord || 
+            if (KeyWord::kEnum == child.fParent->fKeyWord ||
                     (KeyWord::kClass == child.fParent->fKeyWord && child.fParent->fParent &&
                     KeyWord::kEnum == child.fParent->fParent->fKeyWord)) {
                 SkASSERT(Bracket::kBrace == child.fBracket);
@@ -1265,7 +1265,7 @@ string IncludeWriter::resolveMethod(const char* start, const char* end, bool fir
 
 string IncludeWriter::resolveRef(const char* start, const char* end, bool first,
         RefType* refType) {
-        // look up Xxx_Xxx 
+        // look up Xxx_Xxx
     string undername(start, end - start);
     for (const auto& external : fBmhParser->fExternals) {
         if (external.fName == undername) {
@@ -1406,7 +1406,7 @@ int IncludeWriter::lookupReference(const PunctuationState punctuation, const Wor
         if (Word::kFirst != word && '_' != last) {
             temp = ConvertRef(resolved, false);
         }
-    }                     
+    }
     if (temp.length()) {
         if (start > lastWrite) {
             SkASSERT(data[start - 1] >= ' ');
@@ -1503,7 +1503,7 @@ IncludeWriter::Wrote IncludeWriter::rewriteBlock(int size, const char* data, Phr
                         SkASSERT(0);
                 }
                 punctuation = PunctuationState::kPeriod == punctuation ||
-                        (PunctuationState::kStart == punctuation && ' ' >= last) ? 
+                        (PunctuationState::kStart == punctuation && ' ' >= last) ?
                         PunctuationState::kStart : PunctuationState::kSpace;
                 word = Word::kStart;
                 embeddedIndirection = false;
@@ -1639,7 +1639,7 @@ IncludeWriter::Wrote IncludeWriter::rewriteBlock(int size, const char* data, Phr
             case 'k': case 'l': case 'm': case 'n': case 'o':
             case 'p': case 'q': case 'r': case 's': case 't':
             case 'u': case 'v': case 'w': case 'x': case 'y':
-            case 'z': 
+            case 'z':
             case '0': case '1': case '2': case '3': case '4':
             case '5': case '6': case '7': case '8': case '9':
             case '-':
diff --git a/tools/bookmaker/mdOut.cpp b/tools/bookmaker/mdOut.cpp
index 14e34a0131..242d667736 100644
--- a/tools/bookmaker/mdOut.cpp
+++ b/tools/bookmaker/mdOut.cpp
@@ -134,19 +134,19 @@ string MdOut::addReferences(const char* refStart, const char* refEnd,
 // methods may start with upper (static) or lower (most)
 
         // see if this should have been a findable reference
-                 
+
             // look for Sk / sk / SK ..
         if (!ref.compare(0, 2, "Sk") && ref != "Skew" && ref != "Skews" &&
               ref != "Skip" && ref != "Skips") {
             t.reportError("missed Sk prefixed");
             return result;
-        } 
+        }
         if (!ref.compare(0, 2, "SK")) {
             if (BmhParser::Resolvable::kOut != resolvable) {
                 t.reportError("missed SK prefixed");
             }
             return result;
-        } 
+        }
         if (!isupper(start[0])) {
             // TODO:
             // look for all lowercase w/o trailing parens as mistaken method matches
@@ -157,7 +157,7 @@ string MdOut::addReferences(const char* refStart, const char* refEnd,
                 fLastParam = def;
                 distFromParam = 0;
                 continue;
-            } else if (!fInDescription && ref[0] != '0' 
+            } else if (!fInDescription && ref[0] != '0'
                     && string::npos != ref.find_first_of("ABCDEFGHIJKLMNOPQRSTUVWXYZ")) {
                 // FIXME: see isDefined(); check to see if fXX is a member of xx.fXX
                 if (('f' != ref[0] && string::npos == ref.find("()"))
@@ -386,7 +386,7 @@ const Definition* MdOut::findParamType() {
             return paramType;
         }
         if (isupper(name[0])) {
-            lastFull = name; 
+            lastFull = name;
         }
     } while (true);
     return nullptr;
@@ -784,7 +784,7 @@ void MdOut::markTypeOut(Definition* def) {
         case MarkType::kParam: {
             if (TableState::kNone == fTableState) {
                 this->mdHeaderOut(3);
-                fprintf(fOut, 
+                fprintf(fOut,
                         "Parameters\n"
                         "\n"
                         "<table>"
@@ -811,7 +811,7 @@ void MdOut::markTypeOut(Definition* def) {
                 return;
             }
             string refNameStr = def->fParent->fFiddle + "_" + paramNameStr;
-            fprintf(fOut, 
+            fprintf(fOut,
                     "    <td><a name=\"%s\"> <code><strong>%s </strong></code> </a></td> <td>",
                     refNameStr.c_str(), paramNameStr.c_str());
         } break;
@@ -841,7 +841,7 @@ void MdOut::markTypeOut(Definition* def) {
         case MarkType::kStdOut: {
             TextParser code(def);
             this->mdHeaderOut(4);
-            fprintf(fOut, 
+            fprintf(fOut,
                     "Example Output\n"
                     "\n"
                     "~~~~");
diff --git a/tools/bookmaker/spellCheck.cpp b/tools/bookmaker/spellCheck.cpp
index 6e80ee77c2..b2091640d0 100644
--- a/tools/bookmaker/spellCheck.cpp
+++ b/tools/bookmaker/spellCheck.cpp
@@ -10,7 +10,7 @@
 #include "SkOSFile.h"
 #include "SkOSPath.h"
 
-/* 
+/*
 things to do
 if cap word is beginning of sentence, add it to table as lower-case
    word must have only a single initial capital
@@ -428,7 +428,7 @@ void SpellCheck::leafCheck(const char* start, const char* end) {
             case 'k': case 'l': case 'm': case 'n': case 'o':
             case 'p': case 'q': case 'r': case 's': case 't':
             case 'u': case 'v': case 'w': case 'x': case 'y':
-            case 'z': 
+            case 'z':
                 if (!wordStart) {
                     wordStart = chPtr;
                     wordEnd = nullptr;
@@ -441,7 +441,7 @@ void SpellCheck::leafCheck(const char* start, const char* end) {
                 break;
             case '0': case '1': case '2': case '3': case '4':
             case '5': case '6': case '7': case '8': case '9':
-            case '_': 
+            case '_':
                 allLower = false;
             case '-':  // note that dash doesn't clear allLower
                 break;
@@ -603,7 +603,7 @@ void SpellCheck::wordCheck(const string& str) {
     }
     bool inCode = fInCode;
     if (hasUnderscore && isupper(str[0]) && ('S' != str[0] || 'K' != str[1])
-            && !hasColon && !hasDot && !hasParen && !fInStdOut && !inCode && !fInConst 
+            && !hasColon && !hasDot && !hasParen && !fInStdOut && !inCode && !fInConst
             && !sawDigit && !sawSpecial && !sawDash) {
         std::istringstream ss(str);
         string token;
@@ -612,7 +612,7 @@ void SpellCheck::wordCheck(const string& str) {
         }
         return;
     }
-    if (!hasColon && !hasDot && !hasParen && !hasUnderscore 
+    if (!hasColon && !hasDot && !hasParen && !hasUnderscore
             && !fInStdOut && !inCode && !fInConst && !sawDigit
             && islower(str[0]) && isupper(str[1])) {
         inCode = true;
@@ -626,7 +626,7 @@ void SpellCheck::wordCheck(const string& str) {
             }
         }
     }
-    auto& mappy = hasColon ? fColons : 
+    auto& mappy = hasColon ? fColons :
                   hasDot ? fDots :
                   hasParen ? fParens :
                   hasUnderscore ? fUnderscores :
diff --git a/tools/get_current_monitor_profile.cpp b/tools/get_current_monitor_profile.cpp
index 55a96d56dd..096ecd01ce 100644
--- a/tools/get_current_monitor_profile.cpp
+++ b/tools/get_current_monitor_profile.cpp
@@ -19,10 +19,10 @@ int main(int argc, char** argv) {
     CFDataRef dataRef = CGColorSpaceCopyICCProfile(cs);
     const uint8_t* data = CFDataGetBytePtr(dataRef);
     size_t size = CFDataGetLength(dataRef);
-    
+
     SkFILEWStream file("monitor_0.icc");
     file.write(data, size);
-    
+
     CFRelease(cs);
     CFRelease(dataRef);
     return 0;
diff --git a/tools/merge_static_libs.py b/tools/merge_static_libs.py
index 842be18c84..a32c3a5024 100755
--- a/tools/merge_static_libs.py
+++ b/tools/merge_static_libs.py
@@ -15,7 +15,7 @@ def _Usage():
 
 def MergeLibs(in_libs, out_lib):
   """ Merges multiple static libraries into one.
-  
+
   in_libs: list of paths to static libraries to be merged
   out_lib: path to the static library which will be created from in_libs
   """
@@ -38,12 +38,12 @@ def MergeLibs(in_libs, out_lib):
       proc.wait()
       if proc.poll() == 0:
         # The static library is non-thin, and we extracted objects
-        for object in current_objects:
-          objects.append(os.path.abspath(object))
+        for obj in current_objects:
+          objects.append(os.path.abspath(obj))
       elif 'thin archive' in proc.communicate()[0]:
         # The static library is thin, so it contains the paths to its objects
-        for object in current_objects:
-          objects.append(object)
+        for obj in current_objects:
+          objects.append(obj)
       else:
         raise Exception('Failed to extract objects from %s.' % in_lib)
     os.chdir(curdir)
diff --git a/tools/mirror-dev.sh b/tools/mirror-dev.sh
index 0512a78ea3..eb948f4417 100755
--- a/tools/mirror-dev.sh
+++ b/tools/mirror-dev.sh
@@ -1,3 +1,7 @@
+# Copyright 2013 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
  # For each installed *-dev package DEV
  for DEV in $(dpkg --list | grep '^ii  [^ ]' | cut -d ' ' -f 3 | grep '\-dev$')
  do
@@ -10,14 +14,14 @@
             echo "$DEV installed $DEV_64_SO which is real."
             continue
         fi
- 
+
         DEV_64_TARGET=$(readlink $DEV_64_SO)
-        DEV_64_TARGET_FULL=$(readlink -f $DEV_64_SO) 
- 
+        DEV_64_TARGET_FULL=$(readlink -f $DEV_64_SO)
+
         DEV_32_SO=$(echo $DEV_64_SO | sed -e 's@/lib/x86_64-linux-gnu/@/lib/i386-linux-gnu/@')
         DEV_32_TARGET=$(echo $DEV_64_TARGET | sed -e 's@/lib/x86_64-linux-gnu/@/lib/i386-linux-gnu/@')
         DEV_32_TARGET_FULL=$(echo $DEV_64_TARGET_FULL | sed -e 's@/lib/x86_64-linux-gnu/@/lib/i386-linux-gnu/@')
- 
+
         # Error if DEV_32_TARGET does not exist.
         if ! test -e $DEV_32_TARGET_FULL
         then
@@ -27,7 +31,7 @@
             #echo "   $DEV_32_SO -> $DEV_32_TARGET ($DEV_32_TARGET_FULL)"
             continue
         fi
- 
+
         # Create DEV_32_SO
         sudo ln -s $DEV_32_TARGET $DEV_32_SO
      done
diff --git a/tools/skiaserve/tester/tester.py b/tools/skiaserve/tester/tester.py
index b99529c7c3..9bf4c519f4 100644
--- a/tools/skiaserve/tester/tester.py
+++ b/tools/skiaserve/tester/tester.py
@@ -57,7 +57,7 @@ class SkiaServeTester:
     def post(self):
         with open(self.skp, 'rb') as payload:
             files = {'file': payload}
-    
+
             # upload skp
             return Check(requests.post(self.url + '/new', files=files))
 
@@ -73,7 +73,7 @@ class SkiaServeTester:
 
     def enable_gpu(self):
         return Check(requests.post(self.url + '/enableGPU/1'))
-    
+
     def disable_gpu(self):
         return Check(requests.post(self.url + '/enableGPU/0'))
 
diff --git a/tools/test_gpuveto.py b/tools/test_gpuveto.py
index fbb29aefc6..589b403b59 100755
--- a/tools/test_gpuveto.py
+++ b/tools/test_gpuveto.py
@@ -45,7 +45,7 @@ def execute_program(args):
 
     @returns a tuple of the process output (returncode, output)
     """
-    proc = subprocess.Popen(args, stdout=subprocess.PIPE, 
+    proc = subprocess.Popen(args, stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     output, _ = proc.communicate()
     errcode = proc.returncode
@@ -71,11 +71,12 @@ class GpuVeto(object):
         for skp in enumerate(dir_or_file):
             self.process_skp(skp[1])
 
-        sys.stdout.write('TP %d FP %d TN %d FN %d IND %d\n' % (self.truePositives,
-                                                               self.falsePositives,
-                                                               self.trueNegatives,
-                                                               self.falseNegatives,
-                                                               self.indeterminate))
+        sys.stdout.write('TP %d FP %d TN %d FN %d IND %d\n' % (
+            self.truePositives,
+            self.falsePositives,
+            self.trueNegatives,
+            self.falseNegatives,
+            self.indeterminate))
 
 
     def process_skp(self, skp_file):
@@ -95,7 +96,7 @@ class GpuVeto(object):
             suitable = True
 
         # run raster config
-        args = [self.bench_pictures, '-r', skp_file, 
+        args = [self.bench_pictures, '-r', skp_file,
                                      '--repeat', '20',
                                      '--timers', 'w',
                                      '--config', '8888']
@@ -110,7 +111,7 @@ class GpuVeto(object):
         rasterTime = float(matches[0])
 
         # run gpu config
-        args2 = [self.bench_pictures, '-r', skp_file, 
+        args2 = [self.bench_pictures, '-r', skp_file,
                                       '--repeat', '20',
                                       '--timers', 'w',
                                       '--config', 'gpu']
@@ -132,7 +133,7 @@ class GpuVeto(object):
         tol_range = tolerance * gpuTime
 
 
-        if rasterTime > gpuTime - tol_range and rasterTime < gpuTime + tol_range:
+        if gpuTime - tol_range < rasterTime < gpuTime + tol_range:
             result = "NONE"
             self.indeterminate += 1
         elif suitable:
@@ -149,10 +150,10 @@ class GpuVeto(object):
             else:
                 self.trueNegatives += 1
                 result = "TN"
-        
 
-        sys.stdout.write('%s: gpuveto: %d raster %.2f gpu: %.2f  Result: %s\n' % (
-            skp_file, suitable, rasterTime, gpuTime, result))
+
+        sys.stdout.write('%s: gpuveto: %d raster %.2f gpu: %.2f  Result: %s\n'
+            % (skp_file, suitable, rasterTime, gpuTime, result))
 
 def main(main_argv):
     parser = argparse.ArgumentParser()
diff --git a/tools/viewer/sk_app/Window.cpp b/tools/viewer/sk_app/Window.cpp
index 9acea3f415..d7904fd8a7 100644
--- a/tools/viewer/sk_app/Window.cpp
+++ b/tools/viewer/sk_app/Window.cpp
@@ -19,12 +19,12 @@ static bool default_char_func(SkUnichar c, uint32_t modifiers, void* userData) {
     return false;
 }
 
-static bool default_key_func(Window::Key key, Window::InputState state, uint32_t modifiers, 
+static bool default_key_func(Window::Key key, Window::InputState state, uint32_t modifiers,
                              void* userData) {
     return false;
 }
 
-static bool default_mouse_func(int x, int y, Window::InputState state, uint32_t modifiers, 
+static bool default_mouse_func(int x, int y, Window::InputState state, uint32_t modifiers,
                                void* userData) {
     return false;
 }
diff --git a/tools/viewer/sk_app/ios/Window_ios.cpp b/tools/viewer/sk_app/ios/Window_ios.cpp
index d37269703c..c1bdeae5fc 100644
--- a/tools/viewer/sk_app/ios/Window_ios.cpp
+++ b/tools/viewer/sk_app/ios/Window_ios.cpp
@@ -31,7 +31,7 @@ bool Window_ios::initWindow() {
     // we already have a window
     if (fWindow) {
         return true;
-    } 
+    }
 
     constexpr int initialWidth = 1280;
     constexpr int initialHeight = 960;
diff --git a/tools/viewer/sk_app/mac/GLWindowContext_mac.cpp b/tools/viewer/sk_app/mac/GLWindowContext_mac.cpp
index 2515ea471a..7f09d54522 100644
--- a/tools/viewer/sk_app/mac/GLWindowContext_mac.cpp
+++ b/tools/viewer/sk_app/mac/GLWindowContext_mac.cpp
@@ -21,18 +21,18 @@ namespace {
 class GLWindowContext_mac : public GLWindowContext {
 public:
     GLWindowContext_mac(const MacWindowInfo&, const DisplayParams&);
-    
+
     ~GLWindowContext_mac() override;
-    
+
     void onSwapBuffers() override;
 
     sk_sp<const GrGLInterface> onInitializeContext() override;
     void onDestroyContext() override;
-    
+
 private:
     SDL_Window*   fWindow;
     SDL_GLContext fGLContext;
-    
+
     typedef GLWindowContext INHERITED;
 };
 
diff --git a/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp b/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp
index 04fea84e05..409c49f218 100644
--- a/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp
+++ b/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp
@@ -108,7 +108,7 @@ void RasterWindowContext_mac::onSwapBuffers() {
     if (fWindow && fGLContext) {
         // We made/have an off-screen surface. Get the contents as an SkImage:
         sk_sp<SkImage> snapshot = fBackbufferSurface->makeImageSnapshot();
-        
+
         sk_sp<SkSurface> gpuSurface = INHERITED::getBackbufferSurface();
         SkCanvas* gpuCanvas = gpuSurface->getCanvas();
         gpuCanvas->drawImage(snapshot, 0, 0);
diff --git a/tools/viewer/sk_app/mac/Window_mac.cpp b/tools/viewer/sk_app/mac/Window_mac.cpp
index dff7ccbe67..8de5b10450 100644
--- a/tools/viewer/sk_app/mac/Window_mac.cpp
+++ b/tools/viewer/sk_app/mac/Window_mac.cpp
@@ -31,7 +31,7 @@ bool Window_mac::initWindow() {
     // we already have a window
     if (fWindow) {
         return true;
-    } 
+    }
 
     constexpr int initialWidth = 1280;
     constexpr int initialHeight = 960;
@@ -255,7 +255,7 @@ bool Window_mac::attach(BackendType attachType) {
         case kRaster_BackendType:
             fWindowContext = NewRasterForMac(info, fRequestedDisplayParams);
             break;
-            
+
         case kNativeGL_BackendType:
         default:
             fWindowContext = NewGLForMac(info, fRequestedDisplayParams);
diff --git a/tools/viewer/sk_app/mac/Window_mac.h b/tools/viewer/sk_app/mac/Window_mac.h
index eb28ff42da..aa5c8df696 100644
--- a/tools/viewer/sk_app/mac/Window_mac.h
+++ b/tools/viewer/sk_app/mac/Window_mac.h
@@ -53,9 +53,9 @@ private:
 
     SDL_Window*  fWindow;
     Uint32       fWindowID;
-    
+
     int          fMSAASampleCount;
-    
+
     typedef Window INHERITED;
 };
 
diff --git a/tools/viewer/sk_app/mac/main_mac.cpp b/tools/viewer/sk_app/mac/main_mac.cpp
index b30a7ea781..6dcf5b93f7 100644
--- a/tools/viewer/sk_app/mac/main_mac.cpp
+++ b/tools/viewer/sk_app/mac/main_mac.cpp
@@ -38,11 +38,11 @@ int main(int argc, char* argv[]) {
                 case SDL_TEXTINPUT:
                     done = sk_app::Window_mac::HandleWindowEvent(event);
                     break;
-                    
+
                 case SDL_QUIT:
                     done = true;
                     break;
-                    
+
                 default:
                     break;
             }
diff --git a/tools/viewer/sk_app/unix/Window_unix.cpp b/tools/viewer/sk_app/unix/Window_unix.cpp
index ef0d85e0ce..f5ca5ee073 100644
--- a/tools/viewer/sk_app/unix/Window_unix.cpp
+++ b/tools/viewer/sk_app/unix/Window_unix.cpp
@@ -37,8 +37,8 @@ Window* Window::CreateNativeWindow(void* platformData) {
     return window;
 }
 
-const long kEventMask = ExposureMask | StructureNotifyMask | 
-                        KeyPressMask | KeyReleaseMask | 
+const long kEventMask = ExposureMask | StructureNotifyMask |
+                        KeyPressMask | KeyReleaseMask |
                         PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
 
 bool Window_unix::initWindow(Display* display) {
@@ -308,10 +308,10 @@ bool Window_unix::handleEvent(const XEvent& event) {
             KeySym keysym = XkbKeycodeToKeysym(fDisplay, event.xkey.keycode,
                                                0, shiftLevel);
             Window::Key key = get_key(keysym);
-            (void) this->onKey(key, Window::kUp_InputState, 
+            (void) this->onKey(key, Window::kUp_InputState,
                                get_modifiers(event));
         } break;
-        
+
 
         default:
             // these events should be handled in the main event loop
@@ -325,7 +325,7 @@ bool Window_unix::handleEvent(const XEvent& event) {
 void Window_unix::setTitle(const char* title) {
     XTextProperty textproperty;
     XStringListToTextProperty(const_cast<char**>(&title), 1, &textproperty);
-    XSetWMName(fDisplay, fWindow, &textproperty);    
+    XSetWMName(fDisplay, fWindow, &textproperty);
 }
 
 void Window_unix::show() {
@@ -380,7 +380,7 @@ void Window_unix::onInval() {
     event.xexpose.width = this->width();
     event.xexpose.height = this->height();
     event.xexpose.count = 0;
-    
+
     XSendEvent(fDisplay, fWindow, False, 0, &event);
 }
 
diff --git a/tools/viewer/sk_app/unix/Window_unix.h b/tools/viewer/sk_app/unix/Window_unix.h
index 73f21af94a..b59f502eb9 100644
--- a/tools/viewer/sk_app/unix/Window_unix.h
+++ b/tools/viewer/sk_app/unix/Window_unix.h
@@ -51,10 +51,10 @@ public:
     static SkTDynamicHash<Window_unix, XWindow> gWindowMap;
 
     void markPendingPaint() { fPendingPaint = true; }
-    void finishPaint() { 
+    void finishPaint() {
         if (fPendingPaint) {
-            this->onPaint(); 
-            fPendingPaint = false; 
+            this->onPaint();
+            fPendingPaint = false;
         }
     }
 
@@ -65,11 +65,11 @@ public:
             fPendingHeight = height;
         }
     }
-    void finishResize() { 
+    void finishResize() {
         if (fPendingResize) {
-            this->onResize(fPendingWidth, fPendingHeight); 
+            this->onResize(fPendingWidth, fPendingHeight);
             fPendingResize = false;
-        } 
+        }
     }
 
 private:
diff --git a/tools/viewer/sk_app/unix/main_unix.cpp b/tools/viewer/sk_app/unix/main_unix.cpp
index 2837c0332e..4d9a64d6b6 100644
--- a/tools/viewer/sk_app/unix/main_unix.cpp
+++ b/tools/viewer/sk_app/unix/main_unix.cpp
@@ -74,9 +74,9 @@ int main(int argc, char**argv) {
                     done = true;
                 }
                 break;
-            } 
+            }
         }
-        
+
         pendingWindows.foreach(finishWindow);
         if (pendingWindows.count() > 0) {
             app->onIdle();
diff --git a/tools/viewer/sk_app/win/Window_win.cpp b/tools/viewer/sk_app/win/Window_win.cpp
index 5b73b44761..10db0ec675 100644
--- a/tools/viewer/sk_app/win/Window_win.cpp
+++ b/tools/viewer/sk_app/win/Window_win.cpp
@@ -101,7 +101,7 @@ bool Window_win::init(HINSTANCE hInstance) {
 
         // Set the position of the window to the top left corner.
         posX = posY = 0;
-    } 
+    }
     */
  //   gIsFullscreen = fullscreen;
 
@@ -235,19 +235,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_UNICHAR:
-            eventHandled = window->onChar((SkUnichar)wParam, 
+            eventHandled = window->onChar((SkUnichar)wParam,
                                           get_modifiers(message, wParam, lParam));
             break;
 
         case WM_CHAR: {
             const uint16_t* c = reinterpret_cast<uint16_t*>(&wParam);
-            eventHandled = window->onChar(SkUTF16_NextUnichar(&c), 
+            eventHandled = window->onChar(SkUTF16_NextUnichar(&c),
                                           get_modifiers(message, wParam, lParam));
         } break;
 
         case WM_KEYDOWN:
         case WM_SYSKEYDOWN:
-            eventHandled = window->onKey(get_key(wParam), Window::kDown_InputState, 
+            eventHandled = window->onKey(get_key(wParam), Window::kDown_InputState,
                                          get_modifiers(message, wParam, lParam));
             break;
 
@@ -273,7 +273,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             Window::InputState istate = ((wParam & MK_LBUTTON) != 0) ? Window::kDown_InputState
                                                                      : Window::kUp_InputState;
 
-            eventHandled = window->onMouse(xPos, yPos, istate, 
+            eventHandled = window->onMouse(xPos, yPos, istate,
                                             get_modifiers(message, wParam, lParam));
         } break;