merge of main

.bazelignore

@@ -0,0 +1 @@
+infra/bots/.recipe_deps

.bazelproject

@@ -0,0 +1,19 @@
+directories:
+  .
+  -bin
+  -out
+  -node_modules
+  -third_party/externals
+
+# Automatically includes all relevant targets under the 'directories' above
+derive_targets_from_directories: false
+
+targets:
+  # If source code isn't resolving, add additional targets that compile it here
+  //example:hello_world_vulkan
+  //example:hello_world_gl
+additional_languages:
+  # Uncomment any additional languages you want supported
+  javascript
+  python
+  typescript

.bazelrc

@@ -0,0 +1,139 @@
+# https://bazel.build/concepts/platforms-intro#cxx
+# This forces Bazel's C++ rules use platforms to select toolchains instead of the default
+# --crosstool_top, --compiler, etc.
+build --incompatible_enable_cc_toolchain_resolution
+
+# We do not want Bazel to detect any C++ toolchains on the local machine
+# https://github.com/bazelbuild/bazel/blob/4ccc21f2f089971e5f4032397764a4be3549c40a/tools/cpp/cc_configure.bzl#L47
+build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+
+# We would like developers to not upload to the remote build cache, only the RBE workers themselves.
+build --remote_upload_local_results=false
+
+# Enforce stricter environment rules, which eliminates some non-hermetic behavior and therefore
+# improves both the remote cache hit rate and the correctness and repeatability of the build.
+build --incompatible_strict_action_env=true
+
+# This tells Bazel that the host platform can use the hermetic toolchain. This is a small lie until
+# Windows support is added.
+build --host_platform=//bazel/platform:host_with_hermetic_toolchain
+# Linux users (the only platform where we support remote builds currently) can add the following
+# line (uncommented) to //bazel/user/buildrc to allow interchangeable operation between local
+# operations and remote operations.
+# build --host_platform=//bazel/platform:linux_x64_hermetic
+
+# Register our toolchains. We do this here, and not in WORKSPACE.bazel because
+# --extra_toolchains has priority over register_toolchains and we conditionally add some toolchains
+# for RBE.
+build --extra_toolchains=//toolchain:clang_ios_arm64_toolchain
+build --extra_toolchains=//toolchain:clang_linux_x64_toolchain
+build --extra_toolchains=//toolchain:clang_mac_x64_toolchain
+build --extra_toolchains=//toolchain:clang_mac_arm64_toolchain
+build --extra_toolchains=//toolchain:clang_host_mac_x64_target_mac_arm64_toolchain
+build --extra_toolchains=//toolchain:clang_windows_x64_toolchain
+build --extra_toolchains=//toolchain:linux_amd64_ndk_arm64_toolchain
+build --extra_toolchains=//toolchain:linux_amd64_ndk_arm32_toolchain
+
+# Hide DEBUG messages from Bazel.
+# Many of these are things related to the git checkouts that are not relevent to devs.
+# https://bazel.build/reference/command-line-reference#flag--ui_event_filters
+build --ui_event_filters=-debug
+
+# For some reason, since upgrading to Go v1.21 and rules_go v0.42.0, Go binaries fail at runtime
+# with "fatal error: invalid function symbol table" unless we disable cgo via the below flag.
+# Reference:
+# https://github.com/bazelbuild/rules_go/blob/d74d9ab34e8789e6a55a2d9caf0e2b3c63202e04/go/modes.rst#build-settings.
+build --@io_bazel_rules_go//go/config:pure
+
+# =============================================================================
+# Alias to build configurations below. This makes configuring things from
+# the command line easier.
+
+# Flags used by Skia tools, not to be used by clients
+build --flag_alias=adb_platform=//tools/testrunners/common/android/adb_test_runner:adb_platform
+
+# Public CanvasKit flags
+build --flag_alias=ck_enable_fonts=//modules/canvaskit:enable_fonts
+build --flag_alias=ck_disable_fonts=no//modules/canvaskit:enable_fonts
+build --flag_alias=ck_enable_canvas_polyfill=//modules/canvaskit:enable_canvas_polyfill
+build --flag_alias=ck_disable_canvas_polyfill=no//modules/canvaskit:enable_canvas_polyfill
+build --flag_alias=ck_enable_embedded_font=//modules/canvaskit:include_embedded_font
+build --flag_alias=ck_disable_embedded_font=no//modules/canvaskit:include_embedded_font
+build --flag_alias=ck_enable_matrix_js=//modules/canvaskit:include_matrix_js
+build --flag_alias=ck_disable_matrix_js=no//modules/canvaskit:include_matrix_js
+build --flag_alias=ck_enable_skottie=//modules/canvaskit:enable_skottie
+build --flag_alias=ck_disable_skottie=no//modules/canvaskit:enable_skottie
+build --flag_alias=ck_enable_skp_serialization=//modules/canvaskit:enable_skp_serialization
+build --flag_alias=ck_disable_skp_serialization=no//modules/canvaskit:enable_skp_serialization
+build --flag_alias=ck_enable_runtime_effect=//modules/canvaskit:enable_runtime_effect
+build --flag_alias=ck_disable_runtime_effect=no//modules/canvaskit:enable_runtime_effect
+build --flag_alias=ck_enable_webgl=//modules/canvaskit:enable_webgl
+build --flag_alias=ck_exclude_debugger=no//modules/canvaskit:build_for_debugger
+build --flag_alias=ck_include_debugger=//modules/canvaskit:build_for_debugger
+
+# =============================================================================
+# REMOTE BUILD EXECUTION
+# =============================================================================
+
+# =====
+# The following was copied from https://github.com/bazelbuild/bazel-toolchains/blob/ea243d43269df23de03a797cff2347e1fc3d02bb/bazelrc/bazel-4.1.0.bazelrc
+# We should be free to modify this as we see fit.
+#
+# Depending on how many machines are in the remote execution instance, setting
+# this higher can make builds faster by allowing more jobs to run in parallel.
+# Setting it too high can result in jobs that timeout, however, while waiting
+# for a remote machine to execute them.
+build:remote --jobs=50
+
+# Set several flags related to specifying the platform, toolchain and java
+# properties.
+build:remote --java_runtime_version=rbe_jdk
+build:remote --tool_java_runtime_version=rbe_jdk
+
+# When a remote configuration is chosen, add "remote" to the list of spawn_strategies.
+build:remote --spawn_strategy=remote,sandboxed,local
+
+# Enable remote execution so actions are performed on the remote systems.
+build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
+
+# Some long running tasks are linking because the workers have relatively little RAM
+# (at least as of now).
+build:remote --remote_timeout=300
+
+# Enable authentication. This will pick up application default credentials by
+# default. You can use --google_credentials=some_file.json to use a service
+# account credential instead.
+# See https://developers.google.com/remote-build-execution/docs/authentication
+# To authenticate, you should run gcloud auth application-default login
+build:remote --google_default_credentials=true
+
+# End of the copied RBE settings
+#=====
+
+# Use the RBE instance on the skia-rbe GCP project.
+build:remote --remote_instance_name projects/skia-rbe/instances/default_instance
+
+# The linxu_rbe config will build on RBE and default to compiling for linux_x64 using
+# the hermetic toolchain.
+build:linux_rbe --config=remote
+# On the RBE instances, we also have the Java and C++ toolchain from the Docker image available.
+# These need to come after the --extra_toolchains flags (above) that register our hermetic
+# toolchains, because we only want these backup toolchains to be used by Bazel internals,
+# if at all.
+build:linux_rbe --extra_toolchains=//bazel/rbe/gce_linux/java:all
+build:linux_rbe --extra_toolchains=//bazel/rbe/gce_linux/config:cc-toolchain
+# Make the Linux platform available for selection as an Execution platform (if it is not already,
+# e.g. on a Linux host)
+build:linux_rbe --extra_execution_platforms=//bazel/platform:linux_x64_hermetic
+
+# Import our specified build configurations
+# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
+# We chose to split our build configurations into their own file to have better organization
+# because we anticipate that file growing large.
+import %workspace%/bazel/buildrc
+
+# Device-specific configurations.
+import %workspace%/bazel/devicesrc
+
+# Import User's custom builds if they have defined any
+try-import %workspace%/bazel/user/buildrc

.bazelversion

@@ -0,0 +1 @@
+7.3.1

.clang-format

@@ -1,12 +1,26 @@
 ---
 # Typical usage is to apply this to the lines you've modified in a local
-# change. Stage your changes with "git add" and then run:
+# change. Make sure to install git-clang-format [1] by adding it to your
+# path and make it executable.
+#
+# Stage your changes with "git add" and then run:
 # $ git clang-format
 # You can optionally use the "--" file filter to restrict formatting to certain
 # files or directories. The tool will display  the list of files that were
 # modified. These have been modified without being staged. You can review the
 # modifications using "git diff".
 #
+# Some clients are running on older versions of clang-format, so please limit
+# flag choices to options supported by clang-format version 10 and below.
+# - XcodeClangFormat: clang-format 10
+# - bin/clang-format: clang-format 11
+# - brew:             clang-format 14
+#
+# [1] https://source.chromium.org/chromium/chromium/src/+/HEAD:third_party/clang-format/script/git-clang-format
+#
+# IF YOU UPDATE THE CPP SECTION ALSO UPDATE THE OBJECTIVE-C SECTION. IF YOU
+# KNOW HOW TO SHARE SETTINGS BETWEEN THE TWO YOU'RE A TRUE HERO.
+
 Language:        Cpp
 # BasedOnStyle:  Google
 AccessModifierOffset: -4
@@ -25,10 +39,101 @@ AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     100
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        4
+UseTab:          Never
+---
+Language:        ObjC
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
   AfterClass:      false
   AfterControlStatement: false
   AfterEnum:       false
@@ -54,9 +159,9 @@ ContinuationIndentWidth: 8
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
-ExperimentalAutoDetectBinPacking: true
+ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^<.*\.h>'
     Priority:        1
   - Regex:           '^<.*'
@@ -70,8 +175,6 @@ IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: 'SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START'
-MacroBlockEnd:   'SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END'
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBlockIndentWidth: 2

.clang-tidy

@@ -0,0 +1,27 @@
+Checks: >
+    -*,
+    bugprone-argument-comment,
+    bugprone-bool-pointer-implicit-conversion,
+    bugprone-suspicious-string-compare,
+    bugprone-undelegated-constructor,
+    bugprone-unused-raii,
+    bugprone-use-after-move,
+    google-build-namespaces,
+    llvm-namespace-comment,
+    misc-definitions-in-headers,
+    misc-uniqueptr-reset-release,
+    modernize-make-unique,
+    modernize-use-nullptr,
+    modernize-use-override,
+    performance-for-range-copy,
+    performance-move-constructor-init,
+    performance-unnecessary-copy-initialization,
+    readability-const-return-type,
+    readability-redundant-preprocessor,
+    readability-redundant-smartptr-get,
+    readability-static-accessed-through-instance
+CheckOptions:
+  - key:             llvm-namespace-comment.ShortNamespaceLines
+    value:           40
+  - key:             llvm-namespace-comment.SpacesBeforeComments
+    value:           2