AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove more references to "master"

Browse Source 
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>
This commit is contained in:
Leon Scroggins III 2020-07-27 14:52:19 -04:00 committed by Skia Commit-Bot
parent 6007f3bd6f
commit 1ff07066f9
10 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/SKPBench.cpp
View File

@ -85,7 +85,7 @@ void SKPBench::onPerCanvasPreDraw(SkCanvas* canvas) {
}
void SKPBench::onPerCanvasPostDraw(SkCanvas* canvas) {
// Draw the last set of tiles into the master canvas in case we're
// Draw the last set of tiles into the main canvas in case we're
// saving the images
for (int i = 0; i < fTileRects.count(); ++i) {
sk_sp<SkImage> image(fSurfaces[i]->makeImageSnapshot());

4
bench/nanobench.cpp
View File

@ -140,8 +140,8 @@ static DEFINE_bool(skvm, false, "sets gUseSkVMBlitter and gSkVMJITViaDylib");
static DEFINE_bool2(pre_log, p, false,
"Log before running each test. May be incomprehensible when threading");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
static DEFINE_bool(cpu, true, "Run CPU-bound work?");
static DEFINE_bool(gpu, true, "Run GPU-bound work?");
static DEFINE_bool(dryRun, false,
"just print the tests that would be run, without actually running them.");
static DEFINE_string(images, "",

4
dm/DM.cpp
View File

@ -110,8 +110,8 @@ static DEFINE_string(colorImages, "",
static DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
static DEFINE_bool(cpu, true, "Run CPU-bound work?");
static DEFINE_bool(gpu, true, "Run GPU-bound work?");
static DEFINE_bool(dryRun, false,
"just print the tests that would be run, without actually running them.");

4
infra/bots/README.md
View File

@ -16,7 +16,7 @@ Jobs are collections of related tasks which help define sub-sections of the DAG,
for example, to be used as try jobs. Each job is defined as an entry point into
the DAG.
The tasks.json file in this directory is the master list of tasks and jobs for
The tasks.json file in this directory is the list of tasks and jobs for
the repo. Note that tasks.json is NEVER edited by hand but generated via
gen_task.go and the input files enumerated below. The
[Task Scheduler](https://skia.googlesource.com/buildbot/+/master/task_scheduler/README.md)
@ -27,7 +27,7 @@ gen_tasks.go or one of the following input JSON files, rather than tasks.json
itself:
* cfg.json - Basic configuration information for gen_tasks.go.
* jobs.json - The master list of all jobs to run. Edit this to add or remove
* jobs.json - The list of all jobs to run. Edit this to add or remove
bots.
Whenever gen_tasks.go, any of the above JSON files, or assets are changed, you

2
site/dev/tools/codesearch.md
View File

@ -38,7 +38,7 @@ appear here first.
[1]: http://cs.skia.org/ "Chromium code search"
[2]: http://cs/#skia/ "Internal Code Search"
[3]: https://github.com/google/skia "Github mirror of skia"
[4]: https://skia.googlesource.com/ "Master Skia repos on googlesource.com"
[4]: https://skia.googlesource.com/ "Primary Skia repos on googlesource.com"
[5]: https://cs.chromium.org/chromium/skia/buildbot/
Client code search

2
src/effects/SkLayerDrawLooper.cpp
View File

@ -60,7 +60,7 @@ static SkColor4f xferColor(const SkColor4f& src, const SkColor4f& dst, SkBlendMo
}
}
// 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(

1
src/pathops/SkPathOpsDebug.cpp
View File

@ -32,7 +32,6 @@ bool SkPathOpsDebug::gVeryVerbose; // set to true to run extensive checking tes
#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)

7
src/pathops/SkPathOpsDebug.h
View File

@ -251,13 +251,6 @@ DummyClasses(Cubic, Cubic);
#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

4
tests/skia_test.cpp
View File

@ -31,8 +31,8 @@ static DEFINE_bool2(verifyOp, y, false, "compare the pathOps result against a re
static DEFINE_string2(json, J, "", "write json version of tests.");
static DEFINE_bool2(verbose, v, false, "enable verbose output from the test driver.");
static DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
static DEFINE_bool(cpu, true, "Run CPU-bound work?");
static DEFINE_bool(gpu, true, "Run GPU-bound work?");
static DEFINE_string2(match, m, nullptr,
"[~][^]substring[$] [...] of name to run.\n"

2
tools/doxygen/Doxyfile
View File

@ -1352,7 +1352,7 @@ CHM_FILE =
HHC_LOCATION =
# The GENERATE_CHI flag controls if a separate .chi index file is generated
# (YES) or that it should be included in the master .chm file (NO).
# (YES) or that it should be included in the main .chm file (NO).
# The default value is: NO.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.