Remove carriage returns.

Also add a presubmit so they don't get added to source code.

Change-Id: I6a85c6a934b1068a63646a0dcc0d3a08baa96ced
Reviewed-on: https://skia-review.googlesource.com/57110
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index 755ce5cf15..f0a8da3136 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -63,9 +63,9 @@ bool SkPathOpsDebug::ChaseContains(const SkTDArray<SkOpSpanBase* >& chaseArray,
     return false;
 }
 #endif
- 

-#if DEBUG_ACTIVE_SPANS

-SkString SkPathOpsDebug::gActiveSpans;

+ 
+#if DEBUG_ACTIVE_SPANS
+SkString SkPathOpsDebug::gActiveSpans;
 #endif
 
 #if DEBUG_COIN
@@ -333,15 +333,15 @@ void SkPathOpsDebug::ShowActiveSpans(SkOpContourHead* contourList) {
     do {
         contour->debugShowActiveSpans(&str);
     } while ((contour = contour->next()));
-    if (!gActiveSpans.equals(str)) {

-        const char* s = str.c_str();

-        const char* end;

-        while ((end = strchr(s, '\n'))) {

-            SkDebugf("%.*s", end - s + 1, s);

-            s = end + 1;

-        }

-        gActiveSpans.set(str);

-    }

+    if (!gActiveSpans.equals(str)) {
+        const char* s = str.c_str();
+        const char* end;
+        while ((end = strchr(s, '\n'))) {
+            SkDebugf("%.*s", end - s + 1, s);
+            s = end + 1;
+        }
+        gActiveSpans.set(str);
+    }
 #endif
 }
 
diff --git a/src/pathops/SkPathOpsDebug.h b/src/pathops/SkPathOpsDebug.h
index 97fa534a2a..65aedc55df 100644
--- a/src/pathops/SkPathOpsDebug.h
+++ b/src/pathops/SkPathOpsDebug.h
@@ -394,8 +394,8 @@ public:
     static void VerifySimplify(const SkPath& path, const SkPath& result);
 #endif
 
-#if DEBUG_ACTIVE_SPANS

-    static SkString gActiveSpans;

+#if DEBUG_ACTIVE_SPANS
+    static SkString gActiveSpans;
 #endif
 
 };