mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 121.0.6167.0 (#1233107)
This commit is contained in:
@@ -12,13 +12,41 @@ index 431df5d50debe..0fcc9ea8fbb1a 100644
|
||||
if (!host_->GetView()) {
|
||||
return nullptr;
|
||||
}
|
||||
diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
index afefe3cd83dee..6668463247644 100644
|
||||
--- content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
+++ content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||
index a6c27fe9b7f71..11060758d670f 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||
@@ -3272,6 +3272,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
||||
}
|
||||
|
||||
+void RenderWidgetHostImpl::SetCompositorForFlingScheduler(ui::Compositor* compositor)
|
||||
+{
|
||||
+ fling_scheduler_->SetCompositor(compositor);
|
||||
+}
|
||||
+
|
||||
void RenderWidgetHostImpl::AddPendingUserActivation(
|
||||
const WebInputEvent& event) {
|
||||
if ((base::FeatureList::IsEnabled(
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
||||
index 28f81135df654..85125c19aaa2f 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.h
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.h
|
||||
@@ -807,6 +807,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||
|
||||
void ProgressFlingIfNeeded(base::TimeTicks current_time);
|
||||
void StopFling();
|
||||
+ void SetCompositorForFlingScheduler(ui::Compositor* compositor);
|
||||
|
||||
// The RenderWidgetHostImpl will keep showing the old page (for a while) after
|
||||
// navigation until the first frame of the new page arrives. This reduces
|
||||
diff --git content/common/input/fling_scheduler_base.h content/common/input/fling_scheduler_base.h
|
||||
index e8ee63f3abc2e..2d1717082759d 100644
|
||||
--- content/common/input/fling_scheduler_base.h
|
||||
+++ content/common/input/fling_scheduler_base.h
|
||||
@@ -7,12 +7,23 @@
|
||||
|
||||
#include "content/browser/renderer_host/input/fling_controller.h"
|
||||
#include "content/common/input/fling_controller.h"
|
||||
|
||||
+namespace ui {
|
||||
+class Compositor;
|
||||
@@ -40,31 +68,3 @@ index afefe3cd83dee..6668463247644 100644
|
||||
};
|
||||
|
||||
} // namespace content
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||
index a1ce7be62ca99..600b61ffafb34 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||
@@ -3282,6 +3282,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
||||
}
|
||||
|
||||
+void RenderWidgetHostImpl::SetCompositorForFlingScheduler(ui::Compositor* compositor)
|
||||
+{
|
||||
+ fling_scheduler_->SetCompositor(compositor);
|
||||
+}
|
||||
+
|
||||
void RenderWidgetHostImpl::AddPendingUserActivation(
|
||||
const WebInputEvent& event) {
|
||||
if ((base::FeatureList::IsEnabled(
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
||||
index 28001459e1357..42b6450adeef7 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.h
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.h
|
||||
@@ -807,6 +807,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||
|
||||
void ProgressFlingIfNeeded(base::TimeTicks current_time);
|
||||
void StopFling();
|
||||
+ void SetCompositorForFlingScheduler(ui::Compositor* compositor);
|
||||
|
||||
// The RenderWidgetHostImpl will keep showing the old page (for a while) after
|
||||
// navigation until the first frame of the new page arrives. This reduces
|
||||
|
Reference in New Issue
Block a user