Change links from 'master' to 'main' branch.

Bug: chromium:1226949
Change-Id: Ie7b28b2fa094cf0c0a407968d681e580519cbb88
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3148210
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

.vpython

@@ -9,7 +9,7 @@
 # CIPD (the "Chrome Infrastructure Package Deployer" service). Unlike `pip`,
 # this never requires the end-user machine to have a working python extension
 # compilation environment. All of these packages are built using:
-#   https://chromium.googlesource.com/infra/infra/+/master/infra/tools/dockerbuild/
+#   https://chromium.googlesource.com/infra/infra/+/main/infra/tools/dockerbuild/
 #
 # All python scripts in the repo share this same spec, to avoid dependency
 # fragmentation.
@@ -20,10 +20,10 @@
 #   vpython path/to/script.py some --arguments
 #
 # Read more about `vpython` and how to modify this file here:
-#   https://chromium.googlesource.com/infra/infra/+/master/doc/users/vpython.md
+#   https://chromium.googlesource.com/infra/infra/+/main/doc/users/vpython.md
 #
 # For the definition of this spec, see:
-#   https://chromium.googlesource.com/infra/luci/luci-go/+/master/vpython/api/vpython/spec.proto
+#   https://chromium.googlesource.com/infra/luci/luci-go/+/main/vpython/api/vpython/spec.proto
 
 python_version: "2.7"
 

.vpython3

@@ -9,7 +9,7 @@
 # CIPD (the "Chrome Infrastructure Package Deployer" service). Unlike `pip`,
 # this never requires the end-user machine to have a working python extension
 # compilation environment. All of these packages are built using:
-#   https://chromium.googlesource.com/infra/infra/+/master/infra/tools/dockerbuild/
+#   https://chromium.googlesource.com/infra/infra/+/main/infra/tools/dockerbuild/
 #
 # All python scripts in the repo share this same spec, to avoid dependency
 # fragmentation.
@@ -20,7 +20,7 @@
 #   vpython path/to/script.py some --arguments
 #
 # Read more about `vpython` and how to modify this file here:
-#   https://chromium.googlesource.com/infra/infra/+/master/doc/users/vpython.md
+#   https://chromium.googlesource.com/infra/infra/+/main/doc/users/vpython.md
 
 python_version: "3.8"
 

DEPS

@@ -69,7 +69,7 @@ vars = {
   # mirror of third_party/jsoncpp located here:
   # https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/
   # Then get the new hash for jsoncpp_revision from the root Chrome DEPS file:
-  # https://source.chromium.org/chromium/chromium/src/+/master:DEPS
+  # https://source.chromium.org/chromium/chromium/src/+/main:DEPS
   'chromium_jsoncpp_revision': '30a6ac108e24dabac7c2e0df4d33d55032af4ee7',
 
   # Current revision of patched-yasm.

OWNERS

@@ -1,4 +1,4 @@
-# See https://chromium.googlesource.com/angle/angle/+/master/doc/ContributingCode.md#selecting-reviewers for more info
+# See https://chromium.googlesource.com/angle/angle/+/main/doc/ContributingCode.md#selecting-reviewers for more info
 # Note: Owners must be split by domain to avoid git merge conflicts on platforms that cannot have
 # email addresses from all platforms.  Also, to avoid downstream git merge conflicts, all changes
 # to this file should be done in the upstream ANGLE repository's main branch.

doc/Orientation.md

@@ -22,7 +22,7 @@ A basic guide to get up and running fixing bugs and performance issues in ANGLE.
 - (recommended) Download and install [Git for Windows](http://gitforwindows.org/).
 
 - Open Git bash, head to C:/src and follow the steps on
-  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/DevSetup.md#Development-setup-Getting-the-source)
+  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/main/doc/DevSetup.md#Development-setup-Getting-the-source)
   to set up the ANGLE solution for the first time.
 
 - The VS 2017 solution will be in `c:/src/angle/out/sln/ANGLE.sln`. Open and let the installation
@@ -47,7 +47,7 @@ A basic guide to get up and running fixing bugs and performance issues in ANGLE.
 - Ensure you add `depot_tools` to your bashrc as in the wiki link above.
 
 - Follow the steps on
-  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/DevSetup.md#Development-setup-Getting-the-source)
+  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/main/doc/DevSetup.md#Development-setup-Getting-the-source)
   to setup ANGLE's build.
 
 - Building should work at this point! Follow the steps on the Wiki.
@@ -60,11 +60,11 @@ A basic guide to get up and running fixing bugs and performance issues in ANGLE.
   ANGLE checks out a copy in `<angledir>/third_party/cherry`.
 
 - Follow the instructions in the
-  [installation README](https://android.googlesource.com/platform/external/cherry/+/refs/heads/master/README)
+  [installation README](https://android.googlesource.com/platform/external/cherry/+/refs/heads/main/README)
   to get it running. On Windows, use 64-bit.
 
 - Read up on testing with
-  [dEQP on the ANGLE Wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/dEQP.md).
+  [dEQP on the ANGLE Wiki](https://chromium.googlesource.com/angle/angle/+/main/doc/dEQP.md).
 
 - Try running `angle_deqp_gles2_tests_no_gtest` with the flag
   `--deqp-case=dEQP-GLES2.functional.negative_api.*` and load a test report in Cherry.

infra/config/README.md

@@ -6,4 +6,4 @@ run `lucicfg generate main.star`. See [online docs][docs] for `lucicfg`.
 Currently active version can be checked at
 https://luci-config.appspot.com/#/projects/angle .
 
-[docs]: https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/lucicfg/doc/README.md
+[docs]: https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/main/lucicfg/doc/README.md

infra/specs/gn_isolate_map.pyl

@@ -19,7 +19,7 @@
 
 # TODO(crbug.com/816629): Remove the need for this file altogether :). Also,
 # see the canonical Chromium copy:
-# https://chromium.googlesource.com/chromium/src/+/refs/heads/master/testing/buildbot/gn_isolate_map.pyl
+# https://chromium.googlesource.com/chromium/src/+/refs/heads/main/testing/buildbot/gn_isolate_map.pyl
 
 {
   "angle_apks": {

scripts/run_gtest_angle_test.py

@@ -8,7 +8,7 @@ The main contract is that the caller passes the arguments:
 
   --isolated-script-test-output=[FILENAME]
 json is written to that file in the format:
-https://chromium.googlesource.com/chromium/src/+/master/docs/testing/json_test_results_format.md
+https://chromium.googlesource.com/chromium/src/+/main/docs/testing/json_test_results_format.md
 
 Optional argument:
 

src/common/third_party/base/README.angle

@@ -1,7 +1,7 @@
 Name: Chromium base:: helper Classes
 Short Name: base::numerics, base::MRUCachem, base::SHA1
 Version:
-URL: https://chromium.googlesource.com/chromium/src/base/+/master
+URL: https://chromium.googlesource.com/chromium/src/base/+/main
 SOURCE CODE: Copy the Chromium folder manually into this folder and run git cl format.
 Date: 24/05/2017
 Revision: 28b5bbb227d331c01e6ff9b2f8729732135aadc7 (Chromium)

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -2093,7 +2093,7 @@ std::unique_ptr<LinkEvent> ProgramD3D::link(const gl::Context *context,
                     stream << "]\nin the " << gl::GetShaderTypeString(shaderType) << " shader.\n";
 
                     stream << "You could get more details from "
-                              "https://chromium.googlesource.com/angle/angle/+/refs/heads/master/"
+                              "https://chromium.googlesource.com/angle/angle/+/refs/heads/main/"
                               "src/libANGLE/renderer/d3d/d3d11/"
                               "UniformBlockToStructuredBufferTranslation.md\n";
                     ANGLE_PERF_WARNING(context->getState().getDebug(), GL_DEBUG_SEVERITY_MEDIUM,

src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp

@@ -13,7 +13,7 @@ namespace
 {
 
 // Refer to the following link
-// https://source.chromium.org/chromium/chromium/src/+/master:ui/gl/gl_image_native_pixmap.cc;l=24
+// https://source.chromium.org/chromium/chromium/src/+/main:ui/gl/gl_image_native_pixmap.cc;l=24
 #define FOURCC(a, b, c, d)                                          \
     ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
      (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24))

src/libANGLE/renderer/vulkan/doc/OpenGLLineSegmentRasterization.md

@@ -68,7 +68,7 @@ rasterization feature from
 [Bresenham]: https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
 [DiamondRule]: img/LineRasterPixelExample.png
 [Holes]: img/LineRasterHoles.jpg
-[TranslatorVulkan.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/TranslatorVulkan.cpp
+[TranslatorVulkan.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/compiler/translator/TranslatorVulkan.cpp
 [VK_EXT_line_rasterization]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VK_EXT_line_rasterization.html
 [VulkanLineRaster]: https://www.khronos.org/registry/vulkan/specs/1.1/html/chap24.html#primsrast-lines-basic
 [VulkanVsGLLineRaster]: img/LineRasterComparison.gif

src/libANGLE/renderer/vulkan/doc/ShaderModuleCompilation.md

@@ -79,12 +79,12 @@ Note right of "Vulkan Back-end": We init VkShaderModules\nand VkPipeline then\nr
 "Vulkan Back-end"- ->"ANGLE Front-end": return success
 -->
 
-![Vulkan Shader Translation Flow](https://raw.githubusercontent.com/google/angle/master/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg?sanitize=true)
+![Vulkan Shader Translation Flow](https://raw.githubusercontent.com/google/angle/main/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg?sanitize=true)
 
-[GL_KHR_vulkan_glsl]: https://github.com/KhronosGroup/GLSL/blob/master/extensions/khr/GL_KHR_vulkan_glsl.txt
+[GL_KHR_vulkan_glsl]: https://github.com/KhronosGroup/GLSL/blob/main/extensions/khr/GL_KHR_vulkan_glsl.txt
 [glslang]: https://github.com/KhronosGroup/glslang
-[GlslangWrapperVk.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp
+[GlslangWrapperVk.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp
 [SPIRV-Tools]: https://github.com/KhronosGroup/SPIRV-Tools
-[translator]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/
-[TranslatorVulkan.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/TranslatorVulkan.cpp
+[translator]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/compiler/translator/
+[TranslatorVulkan.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/compiler/translator/TranslatorVulkan.cpp
 [VkShaderModule]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkShaderModule.html

src/libANGLE/renderer/vulkan/vk_format_utils.h

@@ -59,7 +59,7 @@ bool HasEmulatedImageChannels(const angle::Format &intendedFormat,
                               const angle::Format &actualFormat);
 
 // Describes a Vulkan format. For more information on formats in the Vulkan back-end please see
-// https://chromium.googlesource.com/angle/angle/+/master/src/libANGLE/renderer/vulkan/doc/FormatTablesAndEmulation.md
+// https://chromium.googlesource.com/angle/angle/+/main/src/libANGLE/renderer/vulkan/doc/FormatTablesAndEmulation.md
 struct Format final : private angle::NonCopyable
 {
     Format();

src/tests/perf_tests/README.md

@@ -8,7 +8,7 @@ You can also build your own dashboards. For example, a comparison of ANGLE's bac
 
 You can follow the usual instructions to [check out and build ANGLE](../../../doc/DevSetup.md). Build the `angle_perftests` target. Note that all test scores are higher-is-better. You should also ensure `is_debug=false` in your build. Running with `angle_assert_always_on` or debug validation enabled is not recommended.
 
-Variance can be a problem when benchmarking. We have a test harness to run a single test in an infinite loop and print some statistics to help mitigate variance. See [`scripts/perf_test_runner.py`](https://chromium.googlesource.com/angle/angle/+/master/scripts/perf_test_runner.py). To use the script first compile `angle_perftests` into a folder with the word `Release` in it. Then provide the name of the test as the argument to the script. The script will automatically pick up the most current `angle_perftests` and run in an infinite loop.
+Variance can be a problem when benchmarking. We have a test harness to run a single test in an infinite loop and print some statistics to help mitigate variance. See [`scripts/perf_test_runner.py`](https://chromium.googlesource.com/angle/angle/+/main/scripts/perf_test_runner.py). To use the script first compile `angle_perftests` into a folder with the word `Release` in it. Then provide the name of the test as the argument to the script. The script will automatically pick up the most current `angle_perftests` and run in an infinite loop.
 
 ### Choosing the Test to Run
 

src/tests/restricted_traces/README.md

@@ -38,7 +38,7 @@ src/tests/restricted_traces/cod_mobile/
 ...
 ```
 
-[CIPD]: https://chromium.googlesource.com/infra/luci/luci-go/+/master/cipd/README.md
+[CIPD]: https://chromium.googlesource.com/infra/luci/luci-go/+/main/cipd/README.md
 
 ## Building the trace tests
 

src/tests/test_utils/runner/README.md

@@ -78,6 +78,6 @@ See the source code for more details: [TestSuite.h](TestSuite.h) and [TestSuite.
  * Closer integration with ANGLE's test expectations and system config libraries.
  * Supporting a GoogleTest-free integration.
 
-[BaseTest]: https://chromium.googlesource.com/chromium/src/+/refs/heads/master/base/test/
-[JSONFormat]: https://chromium.googlesource.com/chromium/src/+/master/docs/testing/json_test_results_format.md
+[BaseTest]: https://chromium.googlesource.com/chromium/src/+/refs/heads/main/base/test/
+[JSONFormat]: https://chromium.googlesource.com/chromium/src/+/main/docs/testing/json_test_results_format.md
 [HistogramSet]: https://chromium.googlesource.com/catapult/+/HEAD/docs/histogram-set-json-format.md

src/tests/test_utils/runner/TestSuite.cpp

@@ -230,7 +230,7 @@ bool WriteJsonFile(const std::string &outputFile, js::Document *doc)
 }
 
 // Writes out a TestResults to the Chromium JSON Test Results format.
-// https://chromium.googlesource.com/chromium/src.git/+/master/docs/testing/json_test_results_format.md
+// https://chromium.googlesource.com/chromium/src.git/+/main/docs/testing/json_test_results_format.md
 void WriteResultsFile(bool interrupted,
                       const TestResults &testResults,
                       const std::string &outputFile,
@@ -1456,7 +1456,7 @@ void ParseTestIdentifierAndSetResult(const std::string &testName,
 
 bool TestSuite::finishProcess(ProcessInfo *processInfo)
 {
-    // Get test results and merge into master list.
+    // Get test results and merge into main list.
     TestResults batchResults;
 
     if (!GetTestResultsFromFile(processInfo->resultsFileName.c_str(), &batchResults))

third_party/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 #
 # See:
-# https://chromium.googlesource.com/chromium/src/+/master/third_party/BUILD.gn
+# https://chromium.googlesource.com/chromium/src/+/main/third_party/BUILD.gn
 
 import("//third_party/libjpeg.gni")
 

third_party/libjpeg.gni

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 #
 # See:
-# https://chromium.googlesource.com/chromium/src/+/master/third_party/libjpeg.gni
+# https://chromium.googlesource.com/chromium/src/+/main/third_party/libjpeg.gni
 
 declare_args() {
   # Uses system libjpeg. If true, overrides use_libjpeg_turbo.