chore: bump chromium to 135.0.7047.0 (main) (#45859)
* chore: bump chromium in DEPS to 135.0.7043.0 * chore: bump chromium in DEPS to 135.0.7045.0 * 6305947: Preconnect to the Glic FRE when the button is hovered.6305947
* 6207093: Remove line_bounds from ImeCompositionRangeChanged6207093
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
21ad7cdda5
commit
e8631b2f3a
3 changed files with 5 additions and 6 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'135.0.7041.2',
|
'135.0.7045.0',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v22.14.0',
|
'v22.14.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -13,8 +13,8 @@ diff --git a/chrome/browser/predictors/preconnect_manager.cc b/chrome/browser/pr
|
||||||
index cf15cdbec9ace9a4e8ffb99811f449030fe2f833..35ca134003a31f692201738e6d1dd93e0890bd75 100644
|
index cf15cdbec9ace9a4e8ffb99811f449030fe2f833..35ca134003a31f692201738e6d1dd93e0890bd75 100644
|
||||||
--- a/chrome/browser/predictors/preconnect_manager.cc
|
--- a/chrome/browser/predictors/preconnect_manager.cc
|
||||||
+++ b/chrome/browser/predictors/preconnect_manager.cc
|
+++ b/chrome/browser/predictors/preconnect_manager.cc
|
||||||
@@ -14,9 +14,11 @@
|
@@ -15,9 +15,11 @@
|
||||||
#include "base/trace_event/trace_event.h"
|
#include "base/types/optional_util.h"
|
||||||
#include "chrome/browser/predictors/predictors_features.h"
|
#include "chrome/browser/predictors/predictors_features.h"
|
||||||
#include "chrome/browser/predictors/predictors_traffic_annotations.h"
|
#include "chrome/browser/predictors/predictors_traffic_annotations.h"
|
||||||
+#if 0
|
+#if 0
|
||||||
|
@ -73,9 +73,9 @@ index 05963f9d2bff9dd438845c09143039fabe818328..0ab1a08e84b0cd360fd4690f8dd683b7
|
||||||
+#if 0
|
+#if 0
|
||||||
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
|
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
|
||||||
+#endif
|
+#endif
|
||||||
|
#include "content/public/browser/storage_partition_config.h"
|
||||||
#include "net/base/network_anonymization_key.h"
|
#include "net/base/network_anonymization_key.h"
|
||||||
#include "url/gurl.h"
|
#include "url/gurl.h"
|
||||||
|
|
||||||
@@ -33,7 +35,28 @@ class NetworkContext;
|
@@ -33,7 +35,28 @@ class NetworkContext;
|
||||||
|
|
||||||
namespace predictors {
|
namespace predictors {
|
||||||
|
|
|
@ -162,8 +162,7 @@ class OffScreenRenderWidgetHostView
|
||||||
CreateSyntheticGestureTarget() override;
|
CreateSyntheticGestureTarget() override;
|
||||||
void ImeCompositionRangeChanged(
|
void ImeCompositionRangeChanged(
|
||||||
const gfx::Range&,
|
const gfx::Range&,
|
||||||
const std::optional<std::vector<gfx::Rect>>& character_bounds,
|
const std::optional<std::vector<gfx::Rect>>& character_bounds) override {}
|
||||||
const std::optional<std::vector<gfx::Rect>>& line_bounds) override {}
|
|
||||||
gfx::Size GetCompositorViewportPixelSize() override;
|
gfx::Size GetCompositorViewportPixelSize() override;
|
||||||
ui::Compositor* GetCompositor() override;
|
ui::Compositor* GetCompositor() override;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue