Merge branch 'main' into add-browsertest-runners-to-ci

Author: Libzu

.github/actions/on_host_tests/action.yaml

@@ -14,7 +14,7 @@ runs:
   using: "composite"
   steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: ${{ inputs.test_artifacts_key }}
     - name: Extract Artifacts

.github/actions/test_targets_json/action.yaml

@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Download Test Targets Json
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: ${{ matrix.platform }}_test_targets_json
         path:

.github/actions/web_tests/action.yaml

@@ -11,7 +11,7 @@ runs:
   using: "composite"
   steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: ${{ inputs.test_artifacts_key }}
     - name: Extract Artifacts

.github/workflows/main.yaml

@@ -796,7 +796,7 @@ jobs:
         shell: bash
       - name: Download Test Results
         if: steps.filter.outputs.skipped != 'true'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: ${{ env.TEST_RESULTS_KEY }}*
           path: results/
@@ -848,7 +848,7 @@ jobs:
           filter: blob:none
           sparse-checkout: ${{ env.CI_ESSENTIALS }}
       - name: Download Test Results
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: ${{ env.TEST_RESULTS_KEY }}*
           path: results/

.github/workflows/sync_chromium_branches.yaml

@@ -47,11 +47,13 @@ jobs:
           git remote add upstream https://chromium.googlesource.com/chromium/src
           git fetch --depth=1 upstream "refs/branch-heads/${{ matrix.branch.branch_num }}:refs/remotes/branch/${{ matrix.branch.branch_num }}"
       - name: Create missing Chromium branch
+        id: create_missing_branch
         if: steps.checkout.outcome == 'failure'
         run: |
           git checkout "refs/remotes/branch/${{ matrix.branch.branch_num }}"
           ORIGINAL_TREE_HASH=$(git rev-parse "HEAD^{tree}")
           ORIGINAL_COMMIT_HASH=$(git rev-parse HEAD)
+          echo "original_commit_hash=${ORIGINAL_COMMIT_HASH}" >> "$GITHUB_OUTPUT"
           NEW_ROOT_COMMIT_HASH=$(git commit-tree "${ORIGINAL_TREE_HASH}" -m "First commit for ${{ matrix.branch.milestone }}.")
           git checkout -b "chromium/${{ matrix.branch.milestone }}" "${NEW_ROOT_COMMIT_HASH}"
           git commit --amend --no-edit -c "${ORIGINAL_COMMIT_HASH}"
@@ -66,6 +68,12 @@ jobs:
             echo "Applying diff..."
             git apply --index chromium_diff.patch
             git commit -m "Rebase refresh on $(date +'%Y-%m-%d') for ${{ matrix.branch.milestone }}."
+
+            echo "LASTCHANGE=${{ steps.create_missing_branch.outputs.original_commit_hash }}" > cobalt/LASTCHANGE.chromium
+            echo "LASTCHANGE_YEAR=$(date +'%Y')" >> cobalt/LASTCHANGE.chromium
+            git add cobalt/LASTCHANGE.chromium
+            git commit -m "Update LASTCHANGE.chromium for ${{ matrix.branch.milestone }}."
+
             git push --force origin "chromium/${{ matrix.branch.milestone }}"
             DIFF_COMMIT_HASH=$(git rev-parse HEAD)
             echo "main_cherry_pick=true" >> "$GITHUB_OUTPUT"

DEPS

@@ -308,7 +308,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '32952ed473705d2ab6127074f4e79d5127ef4145',
+  'v8_revision': 'b40c5631f5d789a9370067e0f492795c0b05bbef',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.

build/util/lastchange.gni

@@ -12,5 +12,9 @@ declare_args() {
 if (use_dummy_lastchange) {
   lastchange_file = "//build/util/LASTCHANGE.dummy"
 } else {
+  if (is_cobalt) {
+    lastchange_file = "//cobalt/LASTCHANGE.chromium"
+  } else {
   lastchange_file = "//build/util/LASTCHANGE"
+  }
 }

cobalt/LASTCHANGE.chromium

@@ -0,0 +1,2 @@
+LASTCHANGE=f14590bbe48717072eb271d6c5ff6b7e88135a1d
+LASTCHANGE_YEAR=2026

cobalt/shell/browser/h5vcc_scheme_url_loader_factory.cc

@@ -215,14 +215,18 @@ class H5vccSchemeURLLoader : public network::mojom::URLLoader {
       mime_type_ = kMimeTypeVideoWebM;
     }
 
+    // Splash caching only serves the png and webm resources defined in
+    // the resource map.
     const bool supports_splash_caching =
         (mime_type_ == kMimeTypeImagePng || mime_type_ == kMimeTypeVideoWebM) &&
-        browser_context_;
+        base::Contains(resource_map, key);
 
-    // Specify the built-in video/png if the cache is unavailable.
+    // For png/webm, override resource_key with "fallback" query param.
+    // If requested key is not found in cache, loader returns the fallback
+    // resource.
     std::string fallback;
-    if (net::GetValueForKeyInQuery(url_, "fallback", &fallback) &&
-        supports_splash_caching) {
+    if (supports_splash_caching &&
+        net::GetValueForKeyInQuery(url_, "fallback", &fallback)) {
       LOG(INFO) << "Fallback splash: " << fallback;
       resource_key = std::move(fallback);
     }
@@ -235,8 +239,7 @@ class H5vccSchemeURLLoader : public network::mojom::URLLoader {
       LOG(WARNING) << "Resource not found: " << resource_key;
     }
 
-    // Only attempt to read files defined in the resource map from cache.
-    if (supports_splash_caching && base::Contains(resource_map, key)) {
+    if (supports_splash_caching && browser_context_) {
       ReadSplashCache(key);
       return;
     }