Add GpuFence for frame sync

BUILD.gn

@@ -804,6 +804,7 @@ group("gn_all") {
             "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}",
           ]
         }
+        deps += [ "//wolvic:empty_group" ]
       }
     }
 

DEPS

@@ -113,6 +113,10 @@ vars = {
   # custom_vars.
   'checkout_src_internal': False,
 
+  # Checkout legacy src_internal. This variable is ignored if
+  # checkout_src_internal is set as false.
+  'checkout_legacy_src_internal': True,
+
   # Fetch the additional packages and files needed to run all of the
   # telemetry tests. This is false by default as some stuff is only
   # privately accessible.
@@ -282,26 +286,31 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   'swiftshader_git': 'https://swiftshader.googlesource.com',
   'webrtc_git': 'https://webrtc.googlesource.com',
+  'igalia_git': 'https://github.com/Igalia',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling V8
+  # and whatever else without interference from each other.
+  'src_internal_revision': 'refs/heads/chromium/5735',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': '95449a75506a28ae31ae7eb383f44bdddbe036e6',
+  'skia_revision': 'refs/heads/chrome/m114',
   # 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': '8a8a1e7086dacc426965d3875914efa66663c431',
+  'v8_revision': 'd7561b88d0679cf8b3097dd5aeb0b49e8af7abb1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '13935469b61588f2f5e651426d33594c4da07b1e',
+  'angle_revision': 'refs/heads/wolvic_experimental',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
   'swiftshader_revision': '23e97b79fb9193bf88e79c16c6a577c680edb2d6',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
-  'pdfium_revision': '48468f15db02dbaaa3de889861f5b4e2da670dde',
+  'pdfium_revision': 'refs/heads/chromium/5735',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
@@ -412,7 +421,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '41428ad681b574566150224df611e3e890bac45f',
+  'dawn_revision': 'refs/heads/chromium/5735',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -436,7 +445,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling nearby
   # and whatever else without interference from each other.
-  'nearby_revision': 'c9cb329cdd70d4e656ad05e2ad319e5cd9cbb528',
+  'nearby_revision': '37000006c224476104276bf74038d60967593814',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling securemessage
   # and whatever else without interference from each other.
@@ -782,7 +791,7 @@ deps = {
 
   'src/clank': {
     'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
-    '5a7dce4b7580056bb0ec2ab210e6174b1b0b6429',
+    'refs/heads/chromium/5735',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -1089,7 +1098,7 @@ deps = {
   },
 
   'src/third_party/angle':
-    Var('chromium_git') + '/angle/angle.git' + '@' +  Var('angle_revision'),
+    Var('igalia_git') + '/wolvic-angle.git' + '@' +  Var('angle_revision'),
 
   'src/third_party/content_analysis_sdk/src':
     Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + 'b8744f00646d175057f0be7443c7c72a311b5381',
@@ -1212,7 +1221,7 @@ deps = {
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
 
   'src/third_party/devtools-frontend-internal': {
-      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '3f0df7df5e0d0dba41f1685a09ec59b6b69bfc4f',
+      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + 'refs/heads/chromium/5735',
     'condition': 'checkout_src_internal',
   },
 
@@ -1749,7 +1758,7 @@ deps = {
   },
 
   'src/third_party/requests/src': {
-      'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'refs/tags/v2.23.0',
+      'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'c7e0fc087ceeadb8b4c84a0953a422c474093d6d',
       'condition': 'checkout_android',
   },
 
@@ -1832,7 +1841,7 @@ deps = {
       'dep_type': 'cipd',
   },
 
-  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@a52479099cf2862650df9dbc12e2e202e345901e',
+  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@refs/heads/chromium/5735',
 
   'src/third_party/vulkan_memory_allocator':
     Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + 'ebe84bec02c041d28f902da0214bf442743fc907',
@@ -1872,7 +1881,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '7d2d22292ce5af280c8c5849ed7f0679d7ab70e9',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'df7df199abd619e75b9f1d9a7e12fc3f3f748775',
+    Var('webrtc_git') + '/src.git' + '@' + 'refs/branch-heads/5735',
 
   # Wuffs' canonical repository is at github.com/google/wuffs, but we use
   # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
@@ -1962,7 +1971,11 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': Var('chrome_git') + '/chrome/src-internal.git@b004f52c8f485ccc2eb918911bf778e10fbe99dd',
+    'url': Var('chrome_git') + '/chrome/src-internal.git' + '@' + Var('src_internal_revision'),
+    'condition': 'checkout_src_internal and checkout_legacy_src_internal',
+  },
+  'src/internal': {
+    'url': Var('chrome_git') + '/chrome/src-internal.git' + '@' + Var('src_internal_revision'),
     'condition': 'checkout_src_internal',
   },
 
@@ -3931,7 +3944,7 @@ deps = {
   # Dependencies from src_internal
   'src/chromeos/assistant/internal': {
       'url': Var('chrome_git') + '/chrome/assistant.git' + '@' +
-        '128a20b1e80a95b33d229722a6e3717cb3cd7c60',
+        'refs/heads/chromium/5735',
       'condition': 'checkout_src_internal and checkout_chromeos',
     },
 
@@ -3941,7 +3954,7 @@ deps = {
   },
 
   'src/libassistant': {
-      'url': Var('chrome_git') + '/chrome/libassistant.git' + '@' + 'fe0ef57f250510e890fc01e1b6c7da7b59117603',
+      'url': Var('chrome_git') + '/chrome/libassistant.git' + '@' + 'refs/heads/chromium/5735',
       'condition': 'checkout_src_internal and checkout_chromeos',
   },
 
@@ -5163,8 +5176,8 @@ recursedeps = [
   'src/third_party/devtools-frontend-internal',
   'src/third_party/openscreen/src',
   'src/third_party/vulkan-deps',
-  # src-internal has its own DEPS file to pull additional internal repos
-  'src-internal',
+  # src/internal has its own DEPS file to pull additional internal repos
+  'src/internal',
   # clank has its own DEPS file, does not need to be in trybot_analyze_config
   # since the roller does not run tests.
   'src/clank',

android_webview/browser/aw_ssl_host_state_delegate.cc

@@ -75,6 +75,21 @@ bool AwSSLHostStateDelegate::IsHttpAllowedForHost(
   return false;
 }
 
+void AwSSLHostStateDelegate::SetHttpsEnforcementForHost(
+    const std::string& host,
+    bool enforce,
+    content::StoragePartition* storage_partition) {
+  // Intentional no-op for Android WebView.
+}
+
+bool AwSSLHostStateDelegate::IsHttpsEnforcedForHost(
+    const std::string& host,
+    content::StoragePartition* storage_partition) {
+  // Intentional no-op for Android WebView. Return value does not matter as
+  // HTTPS-First Mode is not enabled on WebView.
+  return false;
+}
+
 void AwSSLHostStateDelegate::AllowCert(
     const std::string& host,
     const net::X509Certificate& cert,

android_webview/browser/aw_ssl_host_state_delegate.h

@@ -82,6 +82,13 @@ class AwSSLHostStateDelegate : public content::SSLHostStateDelegate {
   bool IsHttpAllowedForHost(
       const std::string& host,
       content::StoragePartition* storage_partition) override;
+  void SetHttpsEnforcementForHost(
+      const std::string& host,
+      bool enforce,
+      content::StoragePartition* storage_partition) override;
+  bool IsHttpsEnforcedForHost(
+      const std::string& host,
+      content::StoragePartition* storage_partition) override;
 
   // Revokes all SSL certificate error allow exceptions made by the user for
   // |host|.

android_webview/browser/cookie_manager.cc

@@ -539,14 +539,21 @@ void CookieManager::GetCookieListAsyncHelper(const GURL& host,
                                              base::OnceClosure complete) {
   net::CookieOptions options = net::CookieOptions::MakeAllInclusive();
 
+  // TODO(crbug.com/1225444): Complete partitioned cookies implementation for
+  // WebView. The current implementation is a temporary fix for
+  // crbug.com/1442333 to let the app access its 1p partitioned cookie.
   if (GetMojoCookieManager()) {
     GetMojoCookieManager()->GetCookieList(
-        host, options, net::CookiePartitionKeyCollection::Todo(),
+        host, options,
+        net::CookiePartitionKeyCollection(
+            net::CookiePartitionKey::FromWire(net::SchemefulSite(host))),
         base::BindOnce(&CookieManager::GetCookieListCompleted,
                        base::Unretained(this), std::move(complete), result));
   } else {
     GetCookieStore()->GetCookieListWithOptionsAsync(
-        host, options, net::CookiePartitionKeyCollection::Todo(),
+        host, options,
+        net::CookiePartitionKeyCollection(
+            net::CookiePartitionKey::FromWire(net::SchemefulSite(host))),
         base::BindOnce(&CookieManager::GetCookieListCompleted,
                        base::Unretained(this), std::move(complete), result));
   }

android_webview/browser/gfx/aw_draw_fn_impl.cc

@@ -30,7 +30,7 @@ namespace {
 
 BASE_FEATURE(kCheckDrawFunctorThread,
              "CheckDrawFunctorThread",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             base::FEATURE_DISABLED_BY_DEFAULT);
 
 AwDrawFnFunctionTable* g_draw_fn_function_table = nullptr;
 

android_webview/java/src/org/chromium/android_webview/BrowserSafeModeActionList.java

@@ -8,7 +8,6 @@
 import org.chromium.android_webview.autofill.ChromeAutocompleteSafeModeAction;
 import org.chromium.android_webview.common.SafeModeAction;
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingSafeModeAction;
-import org.chromium.android_webview.variations.FastVariationsSeedSafeModeAction;
 import org.chromium.android_webview.variations.VariationsSeedSafeModeAction;
 
 /** Exposes the SafeModeActions supported by the browser process. */
@@ -26,7 +25,7 @@ private BrowserSafeModeActionList() {}
             new AndroidAutofillSafeModeAction(),
             new ChromeAutocompleteSafeModeAction(),
             new NoopSafeModeAction(),
-            new FastVariationsSeedSafeModeAction(),
+            // TODO(avvall): Re-add FastVariationsSeedSafeModeAction
             new AwSafeBrowsingSafeModeAction(),
     };
 }

android_webview/java/strings/translations/android_webview_strings_mk.xtb

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="mk">
-<translation id="3572484393913897457">Системски лиценци за WebView</translation>
+<translation id="3572484393913897457">Лиценци за System WebView</translation>
 <translation id="8916631167640856213">Оваа функционалност не е поддржана во оваа верзија на Android.</translation>
 </translationbundle>

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java

@@ -259,6 +259,31 @@ public void testEmbedderCanSeeRestrictedCookies() throws Throwable {
         }
     }
 
+    @Test
+    @MediumTest
+    @Feature({"AndroidWebView"})
+    public void testEmbedderCanSeePartitionedCookies() throws Throwable {
+        TestWebServer webServer = TestWebServer.start();
+        try {
+            // Set a partitioned cookie and an unpartitioned cookie to ensure that they are all
+            // visible to CookieManager in the app.
+            String cookies[] = {"partitioned_cookie=foo; SameSite=None; Secure; Partitioned",
+                    "unpartitioned_cookie=bar; SameSite=None; Secure"};
+            List<Pair<String, String>> responseHeaders = new ArrayList<Pair<String, String>>();
+            for (String cookie : cookies) {
+                responseHeaders.add(Pair.create("Set-Cookie", cookie));
+            }
+            String url = webServer.setResponse("/", "test", responseHeaders);
+            mActivityTestRule.loadUrlSync(
+                    mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+            waitForCookie(url);
+            assertHasCookies(url);
+            validateCookies(url, "partitioned_cookie", "unpartitioned_cookie");
+        } finally {
+            webServer.shutdown();
+        }
+    }
+
     private void setCookieWithDocumentCookieAPI(final String name, final String value)
             throws Throwable {
         JSUtils.executeJavaScriptAndWaitForResult(InstrumentationRegistry.getInstrumentation(),

android_webview/nonembedded/java/src/org/chromium/android_webview/services/NonembeddedSafeModeActionsList.java

@@ -20,6 +20,6 @@ private NonembeddedSafeModeActionsList() {}
      */
     public static final SafeModeAction[] sList = {
             new ComponentUpdaterResetSafeModeAction(),
-            new NonEmbeddedFastVariationsSeedSafeModeAction(),
+            // TODO(avvall): Re-add NonEmbeddedFastVariationsSeedSafeModeAction
     };
 }

android_webview/tools/system_webview_shell/apk/res/menu/main_menu.xml

@@ -10,6 +10,8 @@
           android:title="@string/menu_reset_webview"/>
     <item android:id="@+id/menu_clear_cache"
           android:title="@string/menu_clear_cache"/>
+    <item android:id="@+id/menu_get_cookie"
+          android:title="@string/menu_get_cookie"/>
     <item android:id="@+id/menu_enable_tracing"
           android:checkable="true"
           android:title="@string/menu_enable_tracing"/>

android_webview/tools/system_webview_shell/apk/res/values/strings.xml

@@ -18,6 +18,7 @@
     <string name="menu_reload_webview">Reload</string>
     <string name="menu_reset_webview">Destroy and create new WebView</string>
     <string name="menu_clear_cache">Clear cache</string>
+    <string name="menu_get_cookie">Get Cookie</string>
     <string name="menu_enable_tracing">Enable tracing</string>
     <string name="menu_force_dark_off">Force Dark Off</string>
     <string name="menu_force_dark_auto">Force Dark Auto</string>

android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

@@ -712,6 +712,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mWebView.clearCache(true);
             }
             return true;
+        } else if (itemId == R.id.menu_get_cookie) {
+            String cookie = CookieManager.getInstance().getCookie(mWebView.getUrl());
+            Log.w(TAG, "GetCookie: " + cookie);
+            return true;
         } else if (itemId == R.id.menu_enable_tracing) {
             mEnableTracing = !mEnableTracing;
             item.setChecked(mEnableTracing);

ash/app_list/app_list_bubble_presenter.cc

@@ -42,7 +42,6 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
-#include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
@@ -315,17 +314,6 @@ void AppListBubblePresenter::Dismiss() {
   if (bubble_view_) {
     aura::Window* bubble_window = bubble_view_->GetWidget()->GetNativeWindow();
     DCHECK(bubble_window);
-
-    // Close all transient child windows in the app list (e.g. uninstall dialog)
-    // when the app list is dismissed.
-    auto* manager = ::wm::TransientWindowManager::GetOrCreate(bubble_window);
-    if (manager) {
-      for (auto* child : manager->transient_children()) {
-        manager->RemoveTransientChild(child);
-        child->parent()->RemoveChild(child);
-      }
-    }
-
     Shelf* shelf = Shelf::ForWindow(bubble_window);
     const bool is_side_shelf = !shelf->IsHorizontalAlignment();
     bubble_view_->StartHideAnimation(