Update patches from Chromium 148.0.7778.60 to Chromium 148.0.7778.96.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index a3cce33221b436370994f62a50ece2c32837954b..12567f903dc6df41408a4bc050860dc5ceb3e5cb 100644
|
||||
index 659379c7d74a1772b3d6cecff80be92e9cc4a4ea..1fcae945ff75b1389afeeb14a032136ae9aca834 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4651,6 +4651,7 @@ const FeatureEntry::FeatureVariation
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
index 669daf79fa74a1cae798ddc512f1a83e4adb73b3..bac22210fd40e138a071e5a3cc4de7579ec40405 100644
|
||||
index a72a0002b82aee8fe47834d6e06047b9daf7f86c..ae972b581967426eaad9479c36e182feb1b4e65e 100644
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -2516,6 +2516,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
@@ -2519,6 +2519,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
if (!selection_navigation_url_.is_valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
|
||||
index ce68ab6ad699cbdcd5d479f1adb1636892d6e554..728c2ad2d6e369965f84173ec3f115b3e98c3606 100644
|
||||
index aa3b72b84cd214c8afbab42372462f87518214b6..bac1f2376d9124b17cbb79da71dc2b12f75f8362 100644
|
||||
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
|
||||
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
|
||||
@@ -28,7 +28,7 @@ namespace omnibox {
|
||||
@@ -32,7 +32,7 @@ namespace omnibox {
|
||||
class OmniboxPopupCloser;
|
||||
} // namespace omnibox
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
||||
index 7bac1634aa3ef8f94e269a7e804573ab1791d75a..bcaf2771b134c67fc927352a07e007710c10e844 100644
|
||||
index 17b351832f11252b618dc536d7c2fdda8c67d4ed..b6b91da7121805ec5dd293ee2a332f59bb8f7b9b 100644
|
||||
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
||||
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
||||
@@ -665,6 +665,7 @@ void OmniboxEditModel::StartAutocomplete(bool prevent_inline_autocomplete) {
|
||||
@@ -681,6 +681,7 @@ void OmniboxEditModel::StartAutocomplete(bool prevent_inline_autocomplete) {
|
||||
input_.set_lens_overlay_suggest_inputs(*suggest_inputs);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc b/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc
|
||||
index 39eaf48e023ed8a0d083a3817f347c783e36db65..803da61f2e839e64cdb67fd590a9f5ff07e112cd 100644
|
||||
index c6c9977ab68f8bd0cbd8382f24638c15317d731d..aa4772e945af95261b8034beeb915f7287b82d88 100644
|
||||
--- a/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc
|
||||
+++ b/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc
|
||||
@@ -624,7 +624,7 @@ BrowserViewTabbedLayoutImpl::CalculateProposedLayout(
|
||||
@@ -628,7 +628,7 @@ BrowserViewTabbedLayoutImpl::CalculateProposedLayout(
|
||||
}
|
||||
|
||||
BrowserLayoutParams params = browser_params;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
index 6096db72868ca2ac2684c4744e836a0f8d27acc6..fe472b1e4ae0f43e483b4dbb88e49cd72cff818b 100644
|
||||
index 2959f99e55d035b819a58475aa0cb359a860f527..567809d092df98b45fe8b9708bb1b4384e2b2128 100644
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -352,7 +352,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
index 1701b7550912ab4dba2ce3741af6016394afe37e..f37a53f7c0a210bfefe92c295300d25e5163bd39 100644
|
||||
index f3f6556177d64d77ad09d5b47f206740c7bf5cf7..1812000103294711d36be6fd316f8f4c91d80144 100644
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -572,6 +572,7 @@ void ToolbarView::Init() {
|
||||
@@ -573,6 +573,7 @@ void ToolbarView::Init() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
index e9c7a9180c85381486c18b30d27e3cad9828e986..05c2b60e23fb48053afb878b3cf7cc205c982ea4 100644
|
||||
index 18f2a5a27bf9a017ffd3265ec0f360c3d181510e..83e1012ff1c0aa36006475e28dcde0c4c2349086 100644
|
||||
--- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
@@ -628,6 +628,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName(
|
||||
@@ -637,6 +637,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName(
|
||||
// TODO(446953331): It's error-prone to keep the above if's up to date. When
|
||||
// omnibox input and popup views are replaced with webUI, matches and
|
||||
// actions can store an icon enum instead of `VectorIcon`.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
index cf5a56ee6eeeba1b7060e558874612c44f564560..bcf1ac89f6e1988284287676c745a44e0d3bfaf4 100644
|
||||
index 5870101f9e55d6a55b4eb9c2627ccae9fa97b625..2c59739be6a2d71960c4d4d377e9ce2db0a1275f 100644
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -719,6 +719,7 @@ static_library("test_support") {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
|
||||
index bccb10824f3479010008913ca3173e6fff8c169c..4dd9aa340b038e6e293ac8adf59dea488c020227 100644
|
||||
index 65c4aabff2e189fd1ef36163f6e47d1f555119eb..4441798ce93c02512043c5d36bbe373d3b7f05fd 100644
|
||||
--- a/components/omnibox/browser/BUILD.gn
|
||||
+++ b/components/omnibox/browser/BUILD.gn
|
||||
@@ -393,6 +393,7 @@ static_library("browser") {
|
||||
@@ -394,6 +394,7 @@ static_library("browser") {
|
||||
"//ui/base",
|
||||
"//ui/gfx",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index bccb10824f3479010008913ca3173e6fff8c169c..4dd9aa340b038e6e293ac8adf59dea48
|
||||
|
||||
configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
||||
|
||||
@@ -993,6 +994,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") {
|
||||
@@ -994,6 +995,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") {
|
||||
|
||||
mojom("mojo_bindings") {
|
||||
sources = [ "omnibox.mojom" ]
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
|
||||
index bae66fe359a02b9e3a93dafd3481b03f887a3267..95498d841cfa17d47cc1423809cc9eedc073e2b3 100644
|
||||
index 1a4b5e1c055223b5b81b8f38bf07c1ed980d8149..6d44d2253b5d9c1e20984dc16aabd39dd7cb478f 100644
|
||||
--- a/components/omnibox/browser/autocomplete_controller.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_controller.cc
|
||||
@@ -1291,6 +1291,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
|
||||
@@ -1300,6 +1300,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
|
||||
base::MakeRefCounted<SearchProvider>(provider_client_.get(), this);
|
||||
search_provider_ = search_provider.get();
|
||||
providers_.push_back(std::move(search_provider));
|
||||
@@ -10,7 +10,7 @@ index bae66fe359a02b9e3a93dafd3481b03f887a3267..95498d841cfa17d47cc1423809cc9eed
|
||||
}
|
||||
// Providers run in the order they're added. Add `HistoryURLProvider` after
|
||||
// `SearchProvider` because:
|
||||
@@ -1563,6 +1564,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type,
|
||||
@@ -1572,6 +1573,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type,
|
||||
StartStopTimer();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/translate/core/common/BUILD.gn b/components/translate/core/common/BUILD.gn
|
||||
index dee8b37dfbcd88f127dd0a15ccbc141fe6d7c011..645b983599edb08296223d3c3632f7c078972932 100644
|
||||
index 19174e8fa01bd70436649731d2ef32d1d6b72bef..1b1aa7e18002fb9d86b8d66db3fa4abc761532ee 100644
|
||||
--- a/components/translate/core/common/BUILD.gn
|
||||
+++ b/components/translate/core/common/BUILD.gn
|
||||
@@ -30,6 +30,8 @@ static_library("common") {
|
||||
@@ -32,6 +32,8 @@ static_library("common") {
|
||||
"//third_party/metrics_proto",
|
||||
"//url",
|
||||
]
|
||||
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
index edbc2f2e780972af553200972c4b2ad0d6da87be..c3ad79a6b9a6093ebdd4198de102bd38ea8e8abe 100644
|
||||
index 381f92b90579f94851bd2bde205a68b7846848fc..11adfece89a389508cc3c3f1568d99144dafcf6a 100644
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
@@ -369,6 +369,7 @@ ImageData* BaseRenderingContext2D::getImageData(
|
||||
@@ -372,6 +372,7 @@ ImageData* BaseRenderingContext2D::getImageData(
|
||||
perfetto::EventContext GetEventContext();
|
||||
|
||||
ImageData* BaseRenderingContext2D::getImageDataInternal(
|
||||
@@ -10,7 +10,7 @@ index edbc2f2e780972af553200972c4b2ad0d6da87be..c3ad79a6b9a6093ebdd4198de102bd38
|
||||
int sx,
|
||||
int sy,
|
||||
int sw,
|
||||
@@ -530,6 +531,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
|
||||
@@ -533,6 +534,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
|
||||
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ index edbc2f2e780972af553200972c4b2ad0d6da87be..c3ad79a6b9a6093ebdd4198de102bd38
|
||||
|
||||
return image_data;
|
||||
}
|
||||
@@ -1158,6 +1160,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
|
||||
@@ -1161,6 +1163,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
|
||||
return MakeGarbageCollected<TextMetrics>();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user