Merge branch 'main' into main

.github/config/linux-modular.json

@@ -1,7 +1,7 @@
 {
   "docker_service": "build-linux",
   "on_host_test": true,
-  "on_host_test_shards": ["0", "1", "2", "3", "wpt"],
+  "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
   "platforms": [
     "linux-x64x11-modular"
   ],

.github/config/raspi-2-skia.json

@@ -9,7 +9,7 @@
       "platform":"raspi-2-skia",
       "target_platform":"raspi-2-skia",
       "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments": "is_clang=false"
+      "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false"
     }
   ]
 }

.github/config/raspi-2.json

@@ -14,8 +14,6 @@
   },
   "platforms": [
     "raspi-2",
-    "raspi-2-sbversion-13",
-    "raspi-2-sbversion-14",
     "raspi-2-sbversion-15"
   ],
   "includes": [
@@ -24,33 +22,15 @@
       "platform":"raspi-2",
       "target_platform":"raspi-2",
       "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments": "is_clang=false",
-      "dimension": "release_version=regex:10.*"
-    },
-    {
-      "name":"sbversion-13",
-      "platform":"raspi-2-sbversion-13",
-      "target_platform":"raspi-2",
-      "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments":"is_clang=false",
-      "sb_api_version": "sb_api_version=13",
-      "dimension": "release_version=regex:10.*"
-    },
-    {
-      "name":"sbversion-14",
-      "platform":"raspi-2-sbversion-14",
-      "target_platform":"raspi-2",
-      "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments":"is_clang=false",
-      "sb_api_version": "sb_api_version=14",
+      "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
       "dimension": "release_version=regex:10.*"
     },
     {
       "name":"sbversion-15",
       "platform":"raspi-2-sbversion-15",
       "target_platform":"raspi-2",
       "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments":"is_clang=false",
+      "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
       "sb_api_version": "sb_api_version=15",
       "dimension": "release_version=regex:10.*"
     }

.github/workflows/gradle.yaml

@@ -19,6 +19,7 @@ jobs:
 
     steps:
       - uses: kaidokert/[email protected]
+        timeout-minutes: 30
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

.github/workflows/label-cherry-pick.yaml

@@ -60,6 +60,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           ref: ${{ matrix.target_branch }}
           fetch-depth: 0

.github/workflows/lint.yaml

@@ -38,13 +38,14 @@ jobs:
           rm /tmp/gn.zip
       - name: Checkout
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '^3.7.x'
+          python-version: '3.7'
       - name: Install Pip Packages
         run: pip install -r ${GITHUB_WORKSPACE}/requirements.txt
       - name: Download Resources

.github/workflows/main.yaml

@@ -71,6 +71,7 @@ jobs:
     steps:
       - id: checkout
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 1
           persist-credentials: false
@@ -144,6 +145,7 @@ jobs:
     steps:
       - name: Checkout files
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -179,6 +181,7 @@ jobs:
     steps:
       - name: Checkout files
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 2
           persist-credentials: false
@@ -225,6 +228,7 @@ jobs:
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           # Use fetch depth of 0 to get full history for a valid build id.
           fetch-depth: 0
@@ -312,6 +316,7 @@ jobs:
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 1
           persist-credentials: false
@@ -343,6 +348,7 @@ jobs:
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]
+        timeout-minutes: 30
         with:
           fetch-depth: 1
           persist-credentials: false

.github/workflows/manual-cherry-pick.yaml

@@ -47,6 +47,7 @@ jobs:
     steps:
     - name: Checkout code
       uses: kaidokert/[email protected]
+      timeout-minutes: 30
       with:
         ref: ${{ env.RELEASE_BRANCH }}
         persist-credentials: false

.github/workflows/auto_assign.yaml → .github/workflows/outside_collaborator.yaml

@@ -1,4 +1,4 @@
-name: PR Reviewer Auto Assignment
+name: Outside Collaborator
 
 on:
   pull_request_target:
@@ -16,7 +16,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-    - name: Check if PR author is outside collaborator and assign reviewer
+    - name: Check if PR author is outside collaborator
       env:
         PR_AUTHOR_LOGIN: ${{ github.event.pull_request.user.login }}
         REPO_NAME: ${{ github.event.repository.full_name }}

.github/workflows/raspi-2.yaml

@@ -38,12 +38,3 @@ jobs:
     with:
       platform: raspi-2-skia
       nightly: ${{ github.event.inputs.nightly }}
-  raspi-2-modular:
-    uses: ./.github/workflows/main.yaml
-    permissions:
-      packages: write
-      pull-requests: write
-    with:
-      platform: raspi-2-modular
-      nightly: ${{ github.event.inputs.nightly }}
-      modular: true

.pre-commit-config.yaml

@@ -23,6 +23,7 @@ exclude: |
             extensions/buildflags|
             glimp/include|
             net|
+            internal/kokoro/third-party|
             internal/starboard/shared/playstation/glimp/shaders|
             testing|
             third_party|

cobalt/demos/content/multi-encrypted-video/multi-encrypted-video.html

@@ -23,7 +23,7 @@
           margin: 0;
         }
 
-        #player-layer {
+        #primary-player-layer {
           width: 100%;
           height: 100%;
         }
@@ -33,13 +33,14 @@
           height: 100%;
         }
 
-        #ui-layer {
+        #secondary-player-layer {
           position: absolute;
-          top: 15%;
-          height: 85%;
+          top: 60%;
+          height: 40%;
           width: 100%;
-          background-color: rgba(33, 33, 33, .75);
           padding: 24px;
+          display: flex;
+          justify-content: center;
         }
 
         .item {
@@ -48,22 +49,23 @@
           display: inline-block;
           margin: 24px;
           vertical-align: middle;
+          background-color: rgba(33, 33, 33, .75);
         }
     </style>
   </head>
   <body>
-    <div id="player-layer">
-      <video class="primary" id="primary-video" muted="1" autoplay="1"></video>
+    <div id="primary-player-layer">
+      <video id="primary-video" muted="1" autoplay="1"></video>
     </div>
-    <div id="ui-layer">
-      <div class="item" style="background-color: #D44">
-        <video class="secondary" id="secondary-video-1" muted="1" autoplay="1"></video>
+    <div id="secondary-player-layer">
+      <div class="item">
+        <video id="secondary-video-1" muted="1" autoplay="1"></video>
       </div>
-      <div class="item" style="background-color: #4D4">
-        <video class="secondary" id="secondary-video-2" muted="1" autoplay="1"></video>
+      <div class="item">
+        <video id="secondary-video-2" muted="1" autoplay="1"></video>
       </div>
-      <div class="item" style="background-color: #44D">
-        <video class="secondary" id="secondary-video-3" muted="1" autoplay="1"></video>
+      <div class="item">
+        <video id="secondary-video-3" muted="1" autoplay="1"></video>
       </div>
     </div>
     <script src="multi-encrypted-video.js"></script>