mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.85
This commit is contained in:
committed by
Marshall Greenblatt
parent
85b7cdfa58
commit
e7de5c3d91
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/135.0.7049.52'
|
'chromium_checkout': 'refs/tags/135.0.7049.85'
|
||||||
}
|
}
|
||||||
|
@@ -753,7 +753,7 @@ index 621d3abcfbd83..13bc942b778ce 100644
|
|||||||
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
|
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
|
||||||
// interface to keep these two classes decoupled and testable.
|
// interface to keep these two classes decoupled and testable.
|
||||||
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
|
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||||
index f0a5719241a98..266b7d3ddc534 100644
|
index 6ebae3a0e19fe..f9e2913b8b5bf 100644
|
||||||
--- chrome/browser/ui/views/frame/browser_view_layout.cc
|
--- chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||||
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
|
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||||
@@ -53,6 +53,10 @@
|
@@ -53,6 +53,10 @@
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git ui/gtk/gtk_compat.cc ui/gtk/gtk_compat.cc
|
diff --git ui/gtk/gtk_compat.cc ui/gtk/gtk_compat.cc
|
||||||
index d93d9b94c7ba4..905583f1aa7ce 100644
|
index a4f93deaa7c42..de236923186cc 100644
|
||||||
--- ui/gtk/gtk_compat.cc
|
--- ui/gtk/gtk_compat.cc
|
||||||
+++ ui/gtk/gtk_compat.cc
|
+++ ui/gtk/gtk_compat.cc
|
||||||
@@ -127,7 +127,7 @@ bool LoadGtkImpl() {
|
@@ -127,7 +127,7 @@ bool LoadGtkImpl() {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git ui/gtk/gtk_ui.cc ui/gtk/gtk_ui.cc
|
diff --git ui/gtk/gtk_ui.cc ui/gtk/gtk_ui.cc
|
||||||
index 9f6173bfef86a..828445589d987 100644
|
index 24a5a2c1228e1..7cd1fb1aab76c 100644
|
||||||
--- ui/gtk/gtk_ui.cc
|
--- ui/gtk/gtk_ui.cc
|
||||||
+++ ui/gtk/gtk_ui.cc
|
+++ ui/gtk/gtk_ui.cc
|
||||||
@@ -31,6 +31,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
|
@@ -56,10 +56,10 @@ index f1030a744809c..c222a209949e6 100644
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index f4475e34d3d6c..ad06b50a46a9d 100644
|
index 13120da83057f..a7562af5b868d 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -3733,6 +3733,11 @@ void RenderWidgetHostImpl::StopFling() {
|
@@ -3741,6 +3741,11 @@ void RenderWidgetHostImpl::StopFling() {
|
||||||
GetRenderInputRouter()->StopFling();
|
GetRenderInputRouter()->StopFling();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user