commit 1ff07066f99e3530add697c7f0a5278329cb028a
author Leon Scroggins III <scroggo@google.com> Mon Jul 27 14:52:19 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 28 13:06:07 2020 +0000
tree 8287bc16dd0ae9bbe03b43015f9753edd51cab2f
parent 6007f3bd6f3643bbea14e4d640b4dbad2a1e8138

Remove more references to "master"

Bug: chromium:1101491
Bug: b/161896447

Switch to more inclusive language, like "main", or remove where
simply unnecessary.

Change-Id: I36ef6ec631eb991f54f42b98887333f07c0984c2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306060
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

src/effects/SkLayerDrawLooper.cpp

diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp
index 4259221..ea4c096 100644
--- a/src/effects/SkLayerDrawLooper.cpp
+++ b/src/effects/SkLayerDrawLooper.cpp
@@ -60,7 +60,7 @@
     }
 }
 
-// Even with kEntirePaint_Bits, we always ensure that the master paint's
+// Even with kEntirePaint_Bits, we always ensure that the base paint's
 // text-encoding is respected, since that controls how we interpret the
 // text/length parameters of a draw[Pos]Text call.
 void SkLayerDrawLooper::LayerDrawLooperContext::ApplyInfo(

src/pathops/SkPathOpsDebug.cpp

diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index a6555d1..7c89792 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -32,7 +32,6 @@
 #define FAIL_WITH_NULL_IF(cond, span) \
          do { if (cond) log->record(SkPathOpsDebug::kFail_Glitch, span); } while (false)
 
-#undef RETURN_FALSE_IF
 #define RETURN_FALSE_IF(cond, span) \
          do { if (cond) log->record(SkPathOpsDebug::kReturnFalse_Glitch, span); \
          } while (false)

src/pathops/SkPathOpsDebug.h

diff --git a/src/pathops/SkPathOpsDebug.h b/src/pathops/SkPathOpsDebug.h
index 0274d96..543607d 100644
--- a/src/pathops/SkPathOpsDebug.h
+++ b/src/pathops/SkPathOpsDebug.h
@@ -251,13 +251,6 @@
 #define FAIL_WITH_NULL_IF(cond) \
         do { bool fail = (cond); SkOPASSERT(!fail); if (fail) return nullptr; } while (false)
 
-// Some functions serve two masters: one allows the function to fail, the other expects success
-// always. If abort is true, tests with normal numbers may not fail and assert if they do so.
-// If abort is false, both normal and extreme numbers may return false without asserting.
-#define RETURN_FALSE_IF(abort, cond) \
-        do { bool fail = (cond); SkOPASSERT(!(abort) || !fail); if (fail) return false; \
-        } while (false)
-
 class SkPathOpsDebug {
 public:
 #if DEBUG_COIN