mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 91.0.4472.0 (#870763)
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
|
||||
index 3b00759e513d..90fe332d59f5 100644
|
||||
index 3b00759e513dc..90fe332d59f5b 100644
|
||||
--- components/viz/host/host_display_client.cc
|
||||
+++ components/viz/host/host_display_client.cc
|
||||
@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
|
||||
@ -29,7 +29,7 @@ index 3b00759e513d..90fe332d59f5 100644
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
|
||||
index 5e260e13762f..1ccff27f2fdb 100644
|
||||
index 5e260e13762f6..1ccff27f2fdbe 100644
|
||||
--- components/viz/host/host_display_client.h
|
||||
+++ components/viz/host/host_display_client.h
|
||||
@@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
|
||||
@ -54,7 +54,7 @@ index 5e260e13762f..1ccff27f2fdb 100644
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc
|
||||
index b04f654fe820..131977a36591 100644
|
||||
index b04f654fe820f..131977a36591d 100644
|
||||
--- components/viz/host/layered_window_updater_impl.cc
|
||||
+++ components/viz/host/layered_window_updater_impl.cc
|
||||
@@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
|
||||
@ -67,7 +67,7 @@ index b04f654fe820..131977a36591 100644
|
||||
|
||||
if (!canvas_) {
|
||||
diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h
|
||||
index 1026b739d283..fe562ab60ce9 100644
|
||||
index 1026b739d283f..fe562ab60ce98 100644
|
||||
--- components/viz/host/layered_window_updater_impl.h
|
||||
+++ components/viz/host/layered_window_updater_impl.h
|
||||
@@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
|
||||
@ -80,10 +80,10 @@ index 1026b739d283..fe562ab60ce9 100644
|
||||
private:
|
||||
const HWND hwnd_;
|
||||
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
|
||||
index 898571527429..5e31b5ceafc3 100644
|
||||
index 159fa9efa79fd..b430e2385a5b1 100644
|
||||
--- components/viz/service/BUILD.gn
|
||||
+++ components/viz/service/BUILD.gn
|
||||
@@ -198,6 +198,8 @@ viz_component("service") {
|
||||
@@ -202,6 +202,8 @@ viz_component("service") {
|
||||
"transitions/transferable_resource_tracker.cc",
|
||||
"transitions/transferable_resource_tracker.h",
|
||||
"viz_service_export.h",
|
||||
@ -93,7 +93,7 @@ index 898571527429..5e31b5ceafc3 100644
|
||||
|
||||
defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
|
||||
diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
index 79c800e77a16..c1593b597325 100644
|
||||
index 79c800e77a160..c1593b5973253 100644
|
||||
--- components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
@ -126,10 +126,10 @@ index 79c800e77a16..c1593b597325 100644
|
||||
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
|
||||
display_client);
|
||||
diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
|
||||
index 2bb30e5318b6..535535dd6c10 100644
|
||||
index 599b06c1765ef..e8ae98b0b1320 100644
|
||||
--- components/viz/service/display_embedder/software_output_device_win.cc
|
||||
+++ components/viz/service/display_embedder/software_output_device_win.cc
|
||||
@@ -188,8 +188,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
|
||||
@@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
|
||||
if (!canvas_)
|
||||
return;
|
||||
|
||||
@ -142,10 +142,10 @@ index 2bb30e5318b6..535535dd6c10 100644
|
||||
|
||||
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
||||
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
||||
index 11ac1649ed0f..ab4aaf5e69b1 100644
|
||||
index 2d80f84280b5a..41e45223367f0 100644
|
||||
--- content/browser/compositor/viz_process_transport_factory.cc
|
||||
+++ content/browser/compositor/viz_process_transport_factory.cc
|
||||
@@ -414,8 +414,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||
@@ -418,8 +418,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||
compositor_data.display_private.reset();
|
||||
root_params->display_private =
|
||||
compositor_data.display_private.BindNewEndpointAndPassReceiver();
|
||||
@ -162,10 +162,10 @@ index 11ac1649ed0f..ab4aaf5e69b1 100644
|
||||
compositor_data.display_client->GetBoundRemote(resize_task_runner_);
|
||||
|
||||
diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
index 4ff82130b358..6c2e3e4d3e9b 100644
|
||||
index b6b7ef090eaaf..a892bd4583d7e 100644
|
||||
--- mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
+++ mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
@@ -33,6 +33,7 @@ class Compositor;
|
||||
@@ -34,6 +34,7 @@ class Compositor;
|
||||
|
||||
namespace viz {
|
||||
class HostFrameSinkManager;
|
||||
@ -173,7 +173,7 @@ index 4ff82130b358..6c2e3e4d3e9b 100644
|
||||
}
|
||||
|
||||
namespace mojo {
|
||||
@@ -86,6 +87,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions {
|
||||
@@ -87,6 +88,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions {
|
||||
// For preventing frame swaps of wrong size during resize on Windows.
|
||||
// (https://crbug.com/811945)
|
||||
friend class ui::Compositor;
|
||||
@ -183,10 +183,10 @@ index 4ff82130b358..6c2e3e4d3e9b 100644
|
||||
// running in the same process, so it won't block anything.
|
||||
// TODO(159346933) Remove once the origin isolation logic is moved outside of
|
||||
diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
index 0c9686f3c807..6fc92dda1072 100644
|
||||
index cd26a3dcf99e0..282c5d55c7df3 100644
|
||||
--- services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
+++ services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
@@ -80,12 +80,14 @@ interface DisplayPrivate {
|
||||
@@ -85,12 +85,14 @@ interface DisplayPrivate {
|
||||
};
|
||||
|
||||
interface DisplayClient {
|
||||
@ -203,7 +203,7 @@ index 0c9686f3c807..6fc92dda1072 100644
|
||||
|
||||
// Notifies that a swap has occurred and provides information about the pixel
|
||||
diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
index 6b7fbb6cf13d..e2af75168cb9 100644
|
||||
index 6b7fbb6cf13dc..e2af75168cb91 100644
|
||||
--- services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
+++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
@@ -26,5 +26,5 @@ interface LayeredWindowUpdater {
|
||||
@ -214,7 +214,7 @@ index 6b7fbb6cf13d..e2af75168cb9 100644
|
||||
+ Draw(gfx.mojom.Rect damage_rect) => ();
|
||||
};
|
||||
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
||||
index e4ff4cb0a2ec..5023c6139f4e 100644
|
||||
index e4ff4cb0a2ec2..5023c6139f4eb 100644
|
||||
--- ui/compositor/compositor.h
|
||||
+++ ui/compositor/compositor.h
|
||||
@@ -28,7 +28,9 @@
|
||||
|
Reference in New Issue
Block a user