From 0e0f72bf9c5aaecd3256d339c369a815be7f19fb Mon Sep 17 00:00:00 2001 From: John Palmer <jopalmer@chromium.org> Date: Mon, 7 Jun 2021 09:10:20 +0000 Subject: [PATCH] [COIL] Change chromium code search type links to use main rather than master This CL finishes the changes for all files not in third_party. Top level files were missed by the script, docs changes due to multiple entries on the same line which were not caught by script, but manually fixed up. See this doc: go/chromium-coil-change for more info BUG=1210385 Change-Id: I6d92e2e6fd244174cc370662399fa713a7b8abf5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2927090 Auto-Submit: John Palmer <jopalmer@chromium.org> Commit-Queue: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Jochen Eisinger <jochen@chromium.org> Cr-Commit-Position: refs/heads/master@{#889685} --- .vpython | 6 +++--- .vpython3 | 4 ++-- BUILD.gn | 2 +- DIR_METADATA | 4 ++-- PRESUBMIT.py | 2 +- WATCHLISTS | 2 +- .../how_to_handle_a_new_problem.md | 2 +- docs/ui/android/browser_controls.md | 10 +++++----- docs/ui/create/examples/login_dialog.md | 2 +- styleguide/c++/c++11.html | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.vpython b/.vpython index 8273273747823..55da4c6c42b21 100644 --- a/.vpython +++ b/.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" diff --git a/.vpython3 b/.vpython3 index 2f32b5301f0f2..fbab716e1f05e 100644 --- a/.vpython3 +++ b/.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" # Used by: diff --git a/BUILD.gn b/BUILD.gn index 1985d70f9f0d7..299555e11707b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1216,7 +1216,7 @@ if (!is_ios) { "100", ] - # https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_tests.md + # https://chromium.googlesource.com/chromium/src/+/main/docs/testing/web_tests.md script_test("blink_web_tests") { run_under_python2 = true script = _common_web_test_script diff --git a/DIR_METADATA b/DIR_METADATA index 72d5cc7f41276..6f7b19556ad48 100644 --- a/DIR_METADATA +++ b/DIR_METADATA @@ -5,10 +5,10 @@ # team that works on the code. # # For more information on DIR_METADATA files, see: -# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md +# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/README.md # # For the schema of this file, see Metadata message: -# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto +# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/proto/dir_metadata.proto monorail { project: "chromium" diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 3a07e2d9dadbe..dacf925b5e653 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -4030,7 +4030,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): 'LLVMFuzzerInitialize should not be used, unless your fuzz target needs ' 'to access command line arguments passed to the fuzzer. Instead, prefer ' 'static initialization and shared resources as documented in ' - 'https://chromium.googlesource.com/chromium/src/+/master/testing/' + 'https://chromium.googlesource.com/chromium/src/+/main/testing/' 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) diff --git a/WATCHLISTS b/WATCHLISTS index 0b420585a6128..942ef278554f1 100644 --- a/WATCHLISTS +++ b/WATCHLISTS @@ -3,7 +3,7 @@ # found in the LICENSE file. # Watchlist Rules -# Refer: https://chromium.googlesource.com/chromium/src/+/master/docs/infra/watchlists.md +# Refer: https://chromium.googlesource.com/chromium/src/+/main/docs/infra/watchlists.md # IMPORTANT: The regular expression filepath is tested against each path using # re.search, so it is not usually necessary to add .*. diff --git a/docs/speed/bot_health_sheriffing/how_to_handle_a_new_problem.md b/docs/speed/bot_health_sheriffing/how_to_handle_a_new_problem.md index 5931cf30323e2..191634720331d 100644 --- a/docs/speed/bot_health_sheriffing/how_to_handle_a_new_problem.md +++ b/docs/speed/bot_health_sheriffing/how_to_handle_a_new_problem.md @@ -38,7 +38,7 @@ Add to the bug: * The revision range at which the story started failing (most easily found [through the flakiness dashboard](https://chromium.googlesource.com/chromium/src/+/main/docs/speed/bot_health_sheriffing/what_test_is_failing.md)) -Once the bug is filed, [disable the failing story](https://chromium.googlesource.com/chromium/src/+/master/docs/speed/bot_health_sheriffing/how_to_disable_a_story.md) and [launch a bisect over the revision range of the breakage](https://chromium.googlesource.com/chromium/src/+/main/docs/speed/bot_health_sheriffing/how_to_launch_a_functional_bisect.md), and snooze the alert for 24h to give the bisect time to finish. Once the story is disabled, lower its priority to P2 and assign the bug to the benchmark owner. +Once the bug is filed, [disable the failing story](https://chromium.googlesource.com/chromium/src/+/main/docs/speed/bot_health_sheriffing/how_to_disable_a_story.md) and [launch a bisect over the revision range of the breakage](https://chromium.googlesource.com/chromium/src/+/main/docs/speed/bot_health_sheriffing/how_to_launch_a_functional_bisect.md), and snooze the alert for 24h to give the bisect time to finish. Once the story is disabled, lower its priority to P2 and assign the bug to the benchmark owner. **[Canonical example](https://bugs.cromium.org/p/chromium/issues/detail?id=809063)** diff --git a/docs/ui/android/browser_controls.md b/docs/ui/android/browser_controls.md index 5b9a1a4c19f15..e1dbc2a9ede9b 100644 --- a/docs/ui/android/browser_controls.md +++ b/docs/ui/android/browser_controls.md @@ -16,15 +16,15 @@ The browser controls need to be in sync with the web contents when scrolling. An There are several classes that are used to draw composited textures: - [ViewResourceFrameLayout](https://source.chromium.org/chromium/chromium/src/+/main:components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ViewResourceFrameLayout.java): A view group that can easily be transformed into a texture used by the compositor system. -- [SceneLayer (native)](https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/ui/android/layouts/scene_layer.h): A wrapper that provides a [cc::Layer](https://source.chromium.org/chromium/chromium/src/+/main:cc/layers/layer.h) and dictates how that layout is supposed to interact with the layout system. +- [SceneLayer (native)](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/layouts/scene_layer.h): A wrapper that provides a [cc::Layer](https://source.chromium.org/chromium/chromium/src/+/main:cc/layers/layer.h) and dictates how that layout is supposed to interact with the layout system. - [SceneLayer](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/layouts/java/src/org/chromium/chrome/browser/layouts/scene_layer/SceneLayer.java): The Java representation of SceneLayer. - [SceneOverlay](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/layouts/java/src/org/chromium/chrome/browser/layouts/SceneOverlay.java): An interface that allows for other texture-like things to be drawn on a layout without being a layout itself. - [SceneOverlayLayer](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/layouts/java/src/org/chromium/chrome/browser/layouts/scene_layer/SceneOverlayLayer.java): Extends SceneLayer for SceneOverlay. - [LayoutManager](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/layouts/java/src/org/chromium/chrome/browser/layouts/LayoutManager.java): The class that manages the Layouts. In the browser controls context, this is the manager that adds the SceneOverlay to the Layout to be drawn. -The Android view is wrapped in a `ViewResourceFrameLayout`. If we look at [bottom_control_container.xml](https://source.chromium.org/chromium/chromium/src/+/master:chrome/android/java/res/layout/bottom_control_container.xml), the xml layout for the bottom controls, the views are wrapped in [ScrollingBottomViewResourceFrameLayout](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java). +The Android view is wrapped in a `ViewResourceFrameLayout`. If we look at [bottom_control_container.xml](https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/res/layout/bottom_control_container.xml), the xml layout for the bottom controls, the views are wrapped in [ScrollingBottomViewResourceFrameLayout](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java). -A scene layer ([ScrollingBottomViewSceneLayer](https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java) and its native counterpart [scrolling_bottom_view_scene_layer.cc](https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc) in this example) is responsible for creating a compositor layer using the view resource. [LayoutManager](https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java) adds the scene layer to the global layout. +A scene layer ([ScrollingBottomViewSceneLayer](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java) and its native counterpart [scrolling_bottom_view_scene_layer.cc](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc) in this example) is responsible for creating a compositor layer using the view resource. [LayoutManager](https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java) adds the scene layer to the global layout. See these example CLs [adding a scene layer](https://chromium-review.googlesource.com/c/chromium/src/+/1769631) and [adding the Android view to use as a resource](https://chromium-review.googlesource.com/c/chromium/src/+/1809813). @@ -44,11 +44,11 @@ Browser controls state/positioning information: ### Browser controls in the browser process -[BrowserControlsManager](https://source.chromium.org/chromium/chromium/src/+/master:chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java) is the class that manages the browser controls properties and responds to the browser controls related information that comes from the renderer process. It provides an interface, [BrowserControlsStateProvider](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java), that can be used to get/set browser controls properties. BrowserControlsStateProvider in addition provides an Observer interface for observing changes in browser controls properties and offsets. +[BrowserControlsManager](https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java) is the class that manages the browser controls properties and responds to the browser controls related information that comes from the renderer process. It provides an interface, [BrowserControlsStateProvider](https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java), that can be used to get/set browser controls properties. BrowserControlsStateProvider in addition provides an Observer interface for observing changes in browser controls properties and offsets. ### Browser controls in the renderer: cc and Blink -There are 2 classes that are responsible for calculating the browser controls offsets in the renderer: [cc::BrowserControlsOffsetManager](https://source.chromium.org/chromium/chromium/src/+/master:cc/input/browser_controls_offset_manager.cc) and [blink::BrowserControls](https://source.chromium.org/chromium/chromium/src/+/main:cc/input/browser_controls_offset_manager.cc). These two classes are almost identical in behavior except for some small differences: +There are 2 classes that are responsible for calculating the browser controls offsets in the renderer: [cc::BrowserControlsOffsetManager](https://source.chromium.org/chromium/chromium/src/+/main:cc/input/browser_controls_offset_manager.cc) and [blink::BrowserControls](https://source.chromium.org/chromium/chromium/src/+/main:cc/input/browser_controls_offset_manager.cc). These two classes are almost identical in behavior except for some small differences: - Both classes calculate browser controls offsets during scroll events. Both classes have functions ScrollBegin(), ScrollBy(), and ScrollEnd() that notify the class of the changes in scrolling state. The biggest difference here is that cc::BrowserControlsOffsetManager calculates the offsets when the scroll happens on the cc thread (or impl thread, more on that in [this doc](https://source.chromium.org/chromium/chromium/src/+/main:docs/how_cc_works.md)) while blink::BrowserControls calculates the offsets for main thread scrolling. Today, most of the scrolling happens on the impl thread and the main thread scrolling is used only as a fallback. - Animations are only handled by `cc::BrowserControlsOffsetManager`. Animation in this context means changing the browser controls offsets gradually without user action. There are two types of animations that are handled by this class: diff --git a/docs/ui/create/examples/login_dialog.md b/docs/ui/create/examples/login_dialog.md index e8d63f76806d0..10f9c1535b22d 100644 --- a/docs/ui/create/examples/login_dialog.md +++ b/docs/ui/create/examples/login_dialog.md @@ -158,7 +158,7 @@ This creates a new [`GridLayout`](https://source.chromium.org/chromium/chromium/ row for a given field in our form. The call to [`SetAssociatedLabel()`](https://source.chromium.org/chromium/chromium/src/+/main:ui/views/controls/textfield/textfield.h;l=250;drc=291180454e079aa5c3677dc3f3eaf619a1cf1d42) sets the accessible label relationship between the -[`Label`](https://source.chromium.org/chromium/chromium/src/+/master:ui/views/controls/label.h) and the [`Textfield`](https://source.chromium.org/chromium/chromium/src/+/main:ui/views/controls/textfield/textfield.h) +[`Label`](https://source.chromium.org/chromium/chromium/src/+/main:ui/views/controls/label.h) and the [`Textfield`](https://source.chromium.org/chromium/chromium/src/+/main:ui/views/controls/textfield/textfield.h) and copies the `Label`’s accessible name to the `Textfield`. diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html index 61ee252d0a05b..619d1af88bfa8 100644 --- a/styleguide/c++/c++11.html +++ b/styleguide/c++/c++11.html @@ -307,7 +307,7 @@ The current status of existing standards and Abseil features is: <td><code>absl::Status</code></td> <td>Type for returning detailed errors.</td> <td><a href="https://source.chromium.org/chromium/chromium/src/+/main:third_party/abseil-cpp/absl/status/status.h">status.h</a></td> -<td>Approved for use inside a wrapper type. Use <a href="https://source.chromium.org/chromium/chromium/src/+/master:base/strings/abseil_string_conversions.h">abseil_string_conversions.h</a> to convert to and from <a href="https://source.chromium.org/chromium/chromium/src/+/master:third_party/abseil-cpp/absl/strings/string_view.h">absl::string_view</a> so the wrapper can expose <a href="https://source.chromium.org/chromium/chromium/src/+/master:base/strings/string_piece.h">base::StringPiece</a>. Use <a href="https://source.chromium.org/chromium/chromium/src/+/main:third_party/abseil-cpp/absl/strings/cord.h">absl::Cord</a> directly as minimally necessary to interface; do not expose in the wrapper type API.<br> +<td>Approved for use inside a wrapper type. Use <a href="https://source.chromium.org/chromium/chromium/src/+/main:base/strings/abseil_string_conversions.h">abseil_string_conversions.h</a> to convert to and from <a href="https://source.chromium.org/chromium/chromium/src/+/main:third_party/abseil-cpp/absl/strings/string_view.h">absl::string_view</a> so the wrapper can expose <a href="https://source.chromium.org/chromium/chromium/src/+/main:base/strings/string_piece.h">base::StringPiece</a>. Use <a href="https://source.chromium.org/chromium/chromium/src/+/main:third_party/abseil-cpp/absl/strings/cord.h">absl::Cord</a> directly as minimally necessary to interface; do not expose in the wrapper type API.<br> <a href="https://groups.google.com/a/chromium.org/g/cxx/c/ImdFCSZ-NMA">Discussion thread</a></td> </tr>