flutter · fluttergithubbot · Oct 26, 2021 · Oct 26, 2021
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,7 +22,7 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
 [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
 [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
-[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
+[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
 [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
 [CLA]: https://cla.developers.google.com/
 [flutter/tests]: https://github.com/flutter/tests

diff --git a/DEPS b/DEPS
@@ -36,7 +36,7 @@ vars = {
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
-  # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
+  # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
   'dart_revision': '216e673af260773eddfe18ed0d130ab7502b98d7',

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Framework](https://github.com/flutter/flutter), which provides a modern,
 reactive framework, and a rich set of platform, layout and foundation widgets.
 
 If you want to run/contribute to Flutter Web engine, more tooling can be
-found at [felt](https://github.com/flutter/engine/tree/master/lib/web_ui/dev#whats-felt).
+found at [felt](https://github.com/flutter/engine/tree/main/lib/web_ui/dev#whats-felt).
 This is a tool written to make web engine development experience easy.
 
 If you are new to Flutter, then you will find more general information
@@ -30,7 +30,7 @@ Flutter is a fully open source project, and we welcome contributions.
 Information on how to get started can be found at our
 [contributor guide](CONTRIBUTING.md).
 
-[Build Status - Cirrus]: https://api.cirrus-ci.com/github/flutter/engine.svg?branch=master
+[Build Status - Cirrus]: https://api.cirrus-ci.com/github/flutter/engine.svg?branch=main
 
 [Build status]: https://cirrus-ci.com/github/flutter/engine
 
diff --git a/build/dart/rules.gni b/build/dart/rules.gni
@@ -87,7 +87,7 @@ template("flutter_snapshot") {
       # build) causes the vm service isolate code to be tree-shaken from an app.
       # See the pragma on the entrypoint here:
       #
-      # https://github.com/dart-lang/sdk/blob/master/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
+      # https://github.com/dart-lang/sdk/blob/main/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
       #
       # Also, this define excludes debugging and profiling code from Flutter.
       args += [ "-Ddart.vm.product=true" ]

diff --git a/ci/docker/windows_build/prepare_windows_server_2016_core.ps1 b/ci/docker/windows_build/prepare_windows_server_2016_core.ps1
@@ -41,7 +41,7 @@ setx DEPOT_TOOLS_WIN_TOOLCHAIN 0
 setx GYP_MSVS_OVERRIDE_PATH "c:/Program Files (x86)/Microsoft Visual Studio/2017/Community"
 
 mkdir c:/flutter/engine
-curl https://raw.githubusercontent.com/flutter/engine/master/ci/docker/build/engine_gclient `
+curl https://raw.githubusercontent.com/flutter/engine/main/ci/docker/build/engine_gclient `
     -o c:/flutter/engine/.gclient
 
 # Once the above script finishes successfully, one can make an image of the VM

diff --git a/ci/licenses.sh b/ci/licenses.sh
@@ -89,7 +89,7 @@ function verify_licenses() (
           echo "changed, and then update this file:"
           echo "  flutter/sky/packages/sky_engine/LICENSE"
           echo "For more information, see the script in:"
-          echo "  https://github.com/flutter/engine/tree/master/tools/licenses"
+          echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
           echo ""
           diff -U 6 "flutter/ci/licenses_golden/$(basename "$f")" "$f"
           echo "================================================================="
@@ -109,7 +109,7 @@ function verify_licenses() (
       echo "license tool signature golden file:"
       echo "  ci/licenses_golden/tool_signature"
       echo "For more information, see the script in:"
-      echo "  https://github.com/flutter/engine/tree/master/tools/licenses"
+      echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
       echo ""
       diff -U 6 "flutter/ci/licenses_golden/tool_signature" "out/license_script_output/tool_signature"
       echo "================================================================="

diff --git a/lib/ui/geometry.dart b/lib/ui/geometry.dart
@@ -1445,7 +1445,7 @@ class RRect {
   /// Therefore, this method is only needed for RRect use cases that require
   /// the appropriately scaled radii values.
   ///
-  /// See the [Skia scaling implementation](https://github.com/google/skia/blob/master/src/core/SkRRect.cpp)
+  /// See the [Skia scaling implementation](https://github.com/google/skia/blob/main/src/core/SkRRect.cpp)
   /// for more details.
   RRect scaleRadii() {
     double scale = 1.0;

diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart
@@ -3756,7 +3756,7 @@ class ImageShader extends Shader {
 /// This API is in beta and does not yet work on web.
 /// See https://github.com/flutter/flutter/projects/207 for roadmap.
 ///
-/// [A current specification of valid SPIR-V is here.](https://github.com/flutter/engine/blob/master/lib/spirv/README.md)
+/// [A current specification of valid SPIR-V is here.](https://github.com/flutter/engine/blob/main/lib/spirv/README.md)
 ///
 /// When initializing or updating the `floatUniforms`, the length of float
 /// uniforms must match the total number of floats defined as uniforms in

diff --git a/lib/web_ui/dev/README.md b/lib/web_ui/dev/README.md
@@ -86,7 +86,7 @@ To run tests on Firefox (this will work only on a Linux device):
 felt test --browser=firefox
 ```
 
-For Chrome and Firefox, the tests run on a version locked on the [browser_lock.yaml](https://github.com/flutter/engine/blob/master/lib/web_ui/dev/browser_lock.yaml). In order to use another version, add the version argument:
+For Chrome and Firefox, the tests run on a version locked on the [browser_lock.yaml](https://github.com/flutter/engine/blob/main/lib/web_ui/dev/browser_lock.yaml). In order to use another version, add the version argument:
 
 ```
 felt test --browser=firefox --firefox-version=70.0.1
@@ -184,8 +184,8 @@ Some useful links:
 
 1. For Chrome downloads [link](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html)
 2. Browser and driver CIPD [packages](https://chrome-infra-packages.appspot.com/p/flutter_internal) (note: access is restricted for these packages)
-3. LUCI web [recipe](https://flutter.googlesource.com/recipes/+/refs/heads/master/recipes/web_engine.py)
-4. More general reading on CIPD packages [link](https://chromium.googlesource.com/chromium/src.git/+/master/docs/cipd.md#What-is-CIPD)
+3. LUCI web [recipe](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/web_engine.py)
+4. More general reading on CIPD packages [link](https://chromium.googlesource.com/chromium/src.git/+/main/docs/cipd_and_3pp.md#What-is-CIPD)
 
 ## Troubleshooting
 

diff --git a/lib/web_ui/dev/web_engine_analysis.sh b/lib/web_ui/dev/web_engine_analysis.sh
@@ -5,7 +5,7 @@ set -x
 # web_analysis: a command-line utility for running 'dart analyze' on Flutter Web
 # Engine. Used/Called by LUCI recipes:
 #
-# See: https://flutter.googlesource.com/recipes/+/refs/heads/master/recipes/web_engine.py
+# See: https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/web_engine.py
 
 echo "Engine path $ENGINE_PATH"
 WEB_UI_DIR="$ENGINE_PATH/src/flutter/lib/web_ui"

diff --git a/lib/web_ui/lib/src/engine.dart b/lib/web_ui/lib/src/engine.dart
@@ -12,7 +12,7 @@ library engine;
 // 2. Exports of engine/* files are replaced with a part directive.
 //
 // The code that performs the transformations lives in:
-// - https://github.com/flutter/engine/blob/master/web_sdk/sdk_rewriter.dart
+// - https://github.com/flutter/engine/blob/main/web_sdk/sdk_rewriter.dart
 
 import 'dart:async';
 // Some of these names are used in services/buffers.dart for example.

diff --git a/lib/web_ui/lib/src/engine/html/path/conic.dart b/lib/web_ui/lib/src/engine/html/path/conic.dart
@@ -15,7 +15,7 @@ import 'path_utils.dart';
 /// See "High order approximation of conic sections by quadratic splines"
 /// by Michael Floater, 1993.
 /// Skia implementation reference:
-/// https://github.com/google/skia/blob/master/src/core/SkGeometry.cpp
+/// https://github.com/google/skia/blob/main/src/core/SkGeometry.cpp
 class Conic {
   double p0x, p0y, p1x, p1y, p2x, p2y;
   final double fW;

diff --git a/lib/web_ui/lib/src/engine/html/path/path_metrics.dart b/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
@@ -533,7 +533,7 @@ const double _fTolerance = 0.5;
 /// the path.
 ///
 /// Implementation is based on
-/// https://github.com/google/skia/blob/master/src/core/SkContourMeasure.cpp
+/// https://github.com/google/skia/blob/main/src/core/SkContourMeasure.cpp
 /// to maintain consistency with native platforms.
 class SurfacePathMetric implements ui.PathMetric {
   SurfacePathMetric._(this._measure)

diff --git a/lib/web_ui/lib/src/engine/ulps.dart b/lib/web_ui/lib/src/engine/ulps.dart
@@ -20,7 +20,7 @@ import 'dart:typed_data';
 // For some good articles on the topic, see
 // https://randomascii.wordpress.com/category/floating-point/page/2/
 // Port based on:
-// https://github.com/google/skia/blob/master/include/private/SkFloatBits.h
+// https://github.com/google/skia/blob/main/include/private/SkFloatBits.h
 //
 // Here is the 32 bit IEEE representation:
 //   uint32_t mantissa : 23;

diff --git a/lib/web_ui/lib/src/ui/geometry.dart b/lib/web_ui/lib/src/ui/geometry.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// See https://github.com/flutter/engine/blob/master/lib/ui/geometry.dart for
+// See https://github.com/flutter/engine/blob/main/lib/ui/geometry.dart for
 // documentation of APIs.
 // ignore_for_file: public_member_api_docs
 part of ui;

diff --git a/lib/web_ui/lib/src/ui/painting.dart b/lib/web_ui/lib/src/ui/painting.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// For documentation see https://github.com/flutter/engine/blob/master/lib/ui/painting.dart
+// For documentation see https://github.com/flutter/engine/blob/main/lib/ui/painting.dart
 // ignore_for_file: public_member_api_docs
 part of ui;
 

diff --git a/lib/web_ui/lib/src/ui/path.dart b/lib/web_ui/lib/src/ui/path.dart
@@ -4,7 +4,7 @@
 
 part of ui;
 
-// For documentation see https://github.com/flutter/engine/blob/master/lib/ui/painting.dart
+// For documentation see https://github.com/flutter/engine/blob/main/lib/ui/painting.dart
 // ignore_for_file: public_member_api_docs
 
 abstract class Path {

diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
@@ -664,7 +664,7 @@ public void setAccessibilityDelegate(@Nullable AccessibilityDelegate accessibili
    *
    * <p>The {@code buffer} and {@code strings} form a communication protocol that is implemented
    * here:
-   * https://github.com/flutter/engine/blob/master/shell/platform/android/platform_view_android.cc#L207
+   * https://github.com/flutter/engine/blob/main/shell/platform/android/platform_view_android.cc#L207
    */
   @SuppressWarnings("unused")
   @UiThread
@@ -685,7 +685,7 @@ private void updateSemantics(
    *
    * <p>The {@code buffer} and {@code strings} form a communication protocol that is implemented
    * here:
-   * https://github.com/flutter/engine/blob/master/shell/platform/android/platform_view_android.cc#L207
+   * https://github.com/flutter/engine/blob/main/shell/platform/android/platform_view_android.cc#L207
    *
    * <p>// TODO(cbracken): expand these docs to include more actionable information.
    */

diff --git a/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java b/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 // Loosely based off of
-// https://github.com/android/user-interface-samples/blob/master/WindowInsetsAnimation/app/src/main/java/com/google/android/samples/insetsanimation/RootViewDeferringInsetsCallback.kt
+// https://github.com/android/user-interface-samples/blob/main/WindowInsetsAnimation/app/src/main/java/com/google/android/samples/insetsanimation/RootViewDeferringInsetsCallback.kt
 //
 // When the IME is shown or hidden, it immediately sends an onApplyWindowInsets call
 // with the final state of the IME. This initial call disrupts the animation, which

diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -2023,7 +2023,7 @@ public interface OnAccessibilityChangeListener {
   }
 
   // Must match SemanticsActions in semantics.dart
-  // https://github.com/flutter/engine/blob/master/lib/ui/semantics.dart
+  // https://github.com/flutter/engine/blob/main/lib/ui/semantics.dart
   public enum Action {
     TAP(1 << 0),
     LONG_PRESS(1 << 1),
@@ -2056,7 +2056,7 @@ public enum Action {
   }
 
   // Must match SemanticsFlag in semantics.dart
-  // https://github.com/flutter/engine/blob/master/lib/ui/semantics.dart
+  // https://github.com/flutter/engine/blob/main/lib/ui/semantics.dart
   /* Package */ enum Flag {
     HAS_CHECKED_STATE(1 << 0),
     IS_CHECKED(1 << 1),
@@ -2196,7 +2196,7 @@ private static class LocaleStringAttribute extends StringAttribute {
    * analogous concept within Flutter.
    *
    * <p>To see how this {@code SemanticsNode}'s fields correspond to Flutter's semantics system, see
-   * semantics.dart: https://github.com/flutter/engine/blob/master/lib/ui/semantics.dart
+   * semantics.dart: https://github.com/flutter/engine/blob/main/lib/ui/semantics.dart
    */
   private static class SemanticsNode {
     private static boolean nullableHasAncestor(

diff --git a/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h b/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h
@@ -63,7 +63,7 @@ class FlutterWindowController : public PluginRegistry {
   // application to be run.
   //
   // The |arguments| are passed to the Flutter engine. See:
-  // https://github.com/flutter/engine/blob/master/shell/common/switches.h for
+  // https://github.com/flutter/engine/blob/main/shell/common/switches.h for
   // for details. Not all arguments will apply to desktop.
   //
   // The |aot_library_path| is the path to the libapp.so file for the Flutter

diff --git a/shell/platform/glfw/public/flutter_glfw.h b/shell/platform/glfw/public/flutter_glfw.h
@@ -51,7 +51,7 @@ typedef struct {
   const char* aot_library_path;
   // The switches to pass to the Flutter engine.
   //
-  // See: https://github.com/flutter/engine/blob/master/shell/common/switches.h
+  // See: https://github.com/flutter/engine/blob/main/shell/common/switches.h
   // for details. Not all arguments will apply to desktop.
   const char** switches;
   // The number of elements in |switches|.

diff --git a/shell/platform/windows/keyboard_key_channel_handler.cc b/shell/platform/windows/keyboard_key_channel_handler.cc
@@ -43,7 +43,7 @@ static constexpr int kMaxPendingEvents = 1000;
 // the same scancode as its non-extended counterpart, such as ShiftLeft.  In
 // Chromium's scancode table, from which Flutter's physical key list is
 // derived, these keys are marked with this bit.  See
-// https://chromium.googlesource.com/codesearch/chromium/src/+/refs/heads/master/ui/events/keycodes/dom/dom_code_data.inc
+// https://chromium.googlesource.com/codesearch/chromium/src/+/refs/heads/main/ui/events/keycodes/dom/dom_code_data.inc
 static constexpr int kScancodeExtended = 0xe000;
 
 // Re-definition of the modifiers for compatibility with the Flutter framework.

diff --git a/shell/platform/windows/sequential_id_generator.h b/shell/platform/windows/sequential_id_generator.h
@@ -14,7 +14,7 @@ namespace flutter {
 // new ID is always the lowest possible ID in the sequence.
 //
 // based on
-// https://source.chromium.org/chromium/chromium/src/+/master:ui/gfx/sequential_id_generator.h
+// https://source.chromium.org/chromium/chromium/src/+/main:ui/gfx/sequential_id_generator.h
 class SequentialIdGenerator {
  public:
   // Creates a new generator with the specified lower bound and uppoer bound for

diff --git a/tools/cipd/android_embedding_bundle/README.md b/tools/cipd/android_embedding_bundle/README.md
@@ -12,7 +12,7 @@ modify the dependencies in `build.gradle` and run `gradle updateDependencies`.
 
 Once you have updated the dependencies, you can upload a new version by running
 `cipd create --pkg-def cipd.yaml`. For more, see the Chromium instructions on ["Updating a CIPD
-dependency"](https://chromium.googlesource.com/chromium/src/+/master/docs/cipd.md#Updating-a-CIPD-dependency) for how to upload a package update to CIPD.
+dependency"](https://chromium.googlesource.com/chromium/src/+/main/docs/cipd_and_3pp.md#Updating-a-CIPD-dependency) for how to upload a package update to CIPD.
 
 On successful upload, you will receive a hash for the upload such as
 

diff --git a/tools/dia_dll.py b/tools/dia_dll.py
@@ -5,7 +5,7 @@
 # found in the LICENSE file.
 
 """
-This script is based on chromium/chromium/master/tools/clang/scripts/update.py.
+This script is based on chromium/chromium/main/tools/clang/scripts/update.py.
 
 It is used on Windows platforms to copy the correct msdia*.dll to the
 clang folder, as a "gclient hook".

diff --git a/tools/fuchsia/build_fuchsia_artifacts.py b/tools/fuchsia/build_fuchsia_artifacts.py
@@ -35,7 +35,7 @@ def IsMac():
 
 def GetFuchsiaSDKPath():
   # host_os references the gn host_os
-  # https://gn.googlesource.com/gn/+/master/docs/reference.md#var_host_os
+  # https://gn.googlesource.com/gn/+/main/docs/reference.md#var_host_os
   host_os = ''
   if IsLinux():
     host_os = 'linux'

diff --git a/tools/fuchsia/dart_kernel.gni b/tools/fuchsia/dart_kernel.gni
@@ -70,7 +70,7 @@ template("dart_kernel") {
       # build) causes the vm service isolate code to be tree-shaken from an app.
       # See the pragma on the entrypoint here:
       #
-      # https://github.com/dart-lang/sdk/blob/master/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
+      # https://github.com/dart-lang/sdk/blob/main/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
       #
       # Also, this define excludes debugging and profiling code from Flutter.
       args += [ "-Ddart.vm.product=true" ]

diff --git a/tools/licenses/README.md b/tools/licenses/README.md
@@ -20,7 +20,7 @@ We look at changes to the goldens to determine if there are any actual
 changes to the licenses.
 
 To update the goldens, make sure you've rebased your branch to the
-latest upstream master and then run the following in this directory:
+latest upstream main and then run the following in this directory:
 
 ```
 pub get