Skip to content

Commit

Permalink
Sync fork with chromium/6613
Browse files Browse the repository at this point in the history
  • Loading branch information
huntie committed Dec 18, 2024
2 parents 486803f + 47f04a5 commit 5327e4d
Show file tree
Hide file tree
Showing 5,027 changed files with 522,377 additions and 842,982 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# This key is expected to be visible in the frontend code
# b/349721878
CRUX_API_KEY

4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
name: dist-Release-front_end
path: src/out/Release/gen/front_end
- name: Run unit tests
- name: Run front_end tests
run: |
cd src
npm run unittest -- --expanded-reporting
npm run test -- front_end
8 changes: 8 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# `npm run install-deps` depends on this particular setting.
package-lock = true
# match settings used by `npm run install-deps`.
omit = optional # This is to avoid downloading esbuild-* package.
ignore-scripts = true
save-exact = true
save-dev = true # Only devDependencies are allowed.
prefer-online = true # To consult the mirror instead of local cache.
# See go/sk-npm-audit-mirror.
registry = https://npm.skia.org/chrome-devtools
44 changes: 38 additions & 6 deletions .vscode/devtools-workspace-launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,55 @@
"name": "Run unit tests in VS Code debugger",
"preLaunchTask": "1-build_Debug",
"runtimeExecutable": "/usr/bin/npm",
"runtimeArgs": ["run", "unittest"],
"runtimeArgs": [
"run",
"test",
"front_end"
],
"port": 7722,
"timeout": 30000,
"browserLaunchLocation": "workspace",
"outputCapture": "std",
"trace": true,
"env" : {
"KARMA_TIMEOUT": "3600000"
}
"trace": true
},
{
"type": "pwa-node",
"request": "launch",
"name": "Run end-to-end tests in VS Code debugger",
"preLaunchTask": "1-build_Debug",
"runtimeExecutable": "/usr/bin/npm",
"runtimeArgs": ["run", "e2etest"]
"runtimeArgs": [
"run",
"test",
"test/e2e"
]
},
{
"type": "pwa-node",
"request": "launch",
"name": "Run test",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "/usr/bin/npm",
"runtimeArgs": [
"run",
"test",
"--",
"${file}"
]
},
{
"type": "pwa-node",
"request": "launch",
"name": "Debug test",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "/usr/bin/npm",
"runtimeArgs": [
"run",
"test",
"--",
"--debug",
"${file}"
]
}
]
}
6 changes: 5 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Daniel bellfield <[email protected]>
Danny Eldridge <[email protected]>
Derek Li <[email protected]>
Douglas Chiang <[email protected]>
Dragonish <[email protected]>
Edward Trist <[email protected]>
Ergün Erdoğmuş <[email protected]>
Eric Rannaud <[email protected]>
Expand All @@ -42,12 +43,14 @@ Jake Mulhern <[email protected]>
Jan Keitel <[email protected]>
Jeffrey Chen <[email protected]>
Jesper van den Ende <[email protected]>
Jerome Vouillon <[email protected]>
Juba Borgohain <[email protected]>
Julian Geppert <[email protected]>
Junseo Yoo <[email protected]>
Karntino Areros <[email protected]>
Kohei Ueno <[email protected]>
Krishnal Ciccolella <[email protected]>
Liam DeBeasi <[email protected]>
Luke Swiderski <[email protected]>
Luke Warlow <[email protected]>
Marijn Haverbeke <[email protected]>
Expand All @@ -60,16 +63,17 @@ Paul Fisher <[email protected]>
Per-Olov Jernberg <[email protected]>
PhistucK <[email protected]>
Pradhuman Singh Baid <[email protected]>
Punith B Nayak <[email protected]>
Rahat Muneeb <[email protected]>
Rahul B S <[email protected]>
Rajasekar Murugan <[email protected]>
Ross Wollman <[email protected]>
Royi Hagigi <[email protected]>
Ryan Puhalovich <[email protected]>
Sebastian Markbåge <[email protected]>
Serg Kryvonos <[email protected]>
Simon Siefke <[email protected]>
Stephen Tsoi-A-Sue <[email protected]>
Thomas Stokes <[email protected]>
Tony Kostowny <[email protected]>
Toshiaki Tanaka <[email protected]>
Tushar Singh <[email protected]>
Expand Down
101 changes: 27 additions & 74 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,51 @@ vars = {
'build_with_chromium': False,

'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
'build_revision': '253f9e7fd541bc035d81d794a8fe206b1a0720f6',
'build_revision': '7a8285c06acd753e6228263f48e5595e20ca1577',

'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
'buildtools_revision': '9491ff1efcb98797b3989a454c3bb721272689e5',
'buildtools_revision': '3ef44a2b92d5dd1faa5189a06f3a5febe6db2d58',

'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
'depot_tools_revision': 'de6a9a9692db6667df3b7f972bcead57d6154e9f',
'depot_tools_revision': 'cba7859885743d3c9865e4f1c076a6f2b698932d',

'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
'inspector_protocol_revision': '916f43c554c65ebf4ccd896b0f4e2ac99a67c434',
'inspector_protocol_revision': '2915acabcf62efd7257c57bb8a443a7c389c65cb',

# Keeping track of the last time we rollerd the browser protocol files.
'chromium_browser_protocol_revision' : 'a51d9c64b04a596df7ca3a57a88d5427746fcda2',

'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
'clang_format_revision': 'e5337933f2951cacd3aeacd238ce4578163ca0b9',
'clang_format_revision': '3c0acd2d4e73dd911309d9e970ba09d58bf23a62',

'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',

# GN CIPD package version.
'gn_version': 'git_revision:88e8054aff7bd0cb2295c7d9361d2be0b7355f27',
'gn_version': 'git_revision:b2afae122eeb6ce09c52d63f67dc53fc517dbdc8',

'cmake_version': 'version:3.16.1',
'cmake_version': 'version:[email protected]',

'llvm_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/',
'llvm_revision': 'c08d3b08f6d71e974537de226c68d4c94c396a46',
'llvm_revision': '3c51ea3619e488db19cd26840ed46d58cfc7062f',

'lldb_eval_url': 'https://chromium.googlesource.com/external/github.com/google/lldb-eval.git',
'lldb_eval_revision': 'e87123a7e639bf1d86f24c37079570fb7fa00b72',

# ninja CIPD package version.
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
'ninja_version': 'version:[email protected].6',
# https://chrome-infra-packages.appspot.com/p/infra/3pp/build_support/ninja-1_11_1/
'ninja_version': 'version:[email protected].2',

# Chrome version used for tests. It should be regularly updated to
# match the Canary version listed here:
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
'chrome': '124.0.6339.0',
'chrome': '128.0.6611.0',

# 'magic' text to tell depot_tools that git submodules should be accepted but
# but parity with DEPS file is expected.
'SUBMODULE_MIGRATION': 'True'
'SUBMODULE_MIGRATION': 'True',

# condition to allowlist deps for non-git-source processing.
'non_git_source': 'True',
}

# Only these hosts are allowed for dependencies in this DEPS file.
Expand All @@ -64,7 +70,7 @@ deps = {
},
'third_party/cmake': {
'packages': [{
'package': 'infra/cmake/${{platform}}',
'package': 'infra/3pp/tools/cmake/${{platform}}',
'version': Var('cmake_version')
}],
'dep_type':
Expand Down Expand Up @@ -108,7 +114,7 @@ deps = {
'buildtools/win': {
'packages': [
{
'package': 'gn/gn/windows-${{arch}}',
'package': 'gn/gn/windows-amd64',
'version': Var('gn_version'),
}
],
Expand All @@ -123,6 +129,7 @@ deps = {
}
],
'dep_type': 'cipd',
'condition': 'non_git_source',
},

'build': {
Expand All @@ -140,7 +147,7 @@ deps = {
'third_party/ninja': {
'packages': [
{
'package': 'infra/3pp/tools/ninja/${{platform}}',
'package': 'infra/3pp/build_support/ninja-1_11_1/${{platform}}',
'version': Var('ninja_version'),
}
],
Expand Down Expand Up @@ -216,58 +223,6 @@ hooks = [
],
},

# Pull clang-format binaries using checked-in hashes.
{
'name': 'clang_format_win',
'pattern': '.',
'condition': 'host_os == "win" and build_with_chromium == False',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', 'buildtools/win/clang-format.exe.sha1',
],
},
{
'name': 'clang_format_mac_x64',
'pattern': '.',
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "x64"',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', 'buildtools/mac/clang-format.x64.sha1',
'-o', 'buildtools/mac/clang-format',
],
},
{
'name': 'clang_format_mac_arm64',
'pattern': '.',
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64"',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', 'buildtools/mac/clang-format.arm64.sha1',
'-o', 'buildtools/mac/clang-format',
],
},
{
'name': 'clang_format_linux',
'pattern': '.',
'condition': 'host_os == "linux" and build_with_chromium == False',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', 'buildtools/linux64/clang-format.sha1',
],
},

# Pull Chrome binaries from CfT buckets.
{
'name': 'download_chrome_win',
Expand Down Expand Up @@ -334,13 +289,6 @@ hooks = [
'action': ['python3', 'build/util/lastchange.py',
'-o', 'build/util/LASTCHANGE'],
},
{
'name': 'sysroot_x64',
'pattern': '.',
'condition': 'checkout_linux and checkout_x64 and build_with_chromium == False',
'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x64'],
},
{
'name': 'emscripten',
'pattern': '.',
Expand All @@ -354,3 +302,8 @@ hooks = [
'action': ['python3', 'third_party/node/node.py', '--output', 'scripts/deps/sync-vscode-settings.js']
},
]

recursedeps = [
'build',
'buildtools',
]
Loading

0 comments on commit 5327e4d

Please sign in to comment.