Skip to content

Commit cff0ad9

Browse files
committed
Update to Chromium 138.0.7204.100
1 parent d35f39c commit cff0ad9

File tree

5 files changed

+33
-26
lines changed

5 files changed

+33
-26
lines changed

chromium_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
138.0.7204.96
1+
138.0.7204.100

patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3604,7 +3604,7 @@
36043604
#include "components/saved_tab_groups/public/features.h"
36053605
#include "components/signin/public/base/signin_buildflags.h"
36063606
#include "components/signin/public/base/signin_switches.h"
3607-
@@ -3450,11 +3449,6 @@ void AddSiteSettingsStrings(content::Web
3607+
@@ -3453,11 +3452,6 @@ void AddSiteSettingsStrings(content::Web
36083608
html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
36093609

36103610
html_source->AddBoolean(
@@ -3618,15 +3618,15 @@
36183618

36193619
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
36203620
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
3621-
@@ -114,7 +114,6 @@
3622-
#include "components/regional_capabilities/regional_capabilities_service.h"
3621+
@@ -116,7 +116,6 @@
36233622
#include "components/safe_browsing/core/common/features.h"
36243623
#include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h"
3624+
#include "components/search_engines/template_url_service.h"
36253625
-#include "components/signin/public/base/signin_pref_names.h"
36263626
#include "components/signin/public/base/signin_switches.h"
36273627
#include "components/sync/base/features.h"
36283628
#include "content/public/browser/url_data_source.h"
3629-
@@ -296,9 +295,7 @@ SettingsUI::SettingsUI(content::WebUI* w
3629+
@@ -298,9 +297,7 @@ SettingsUI::SettingsUI(content::WebUI* w
36303630
}
36313631
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
36323632

patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,6 @@ approach to change color components.
9999
+}
100100
+
101101
} // namespace blink
102-
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
103-
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
104-
@@ -130,6 +130,10 @@ base::span<const uint8_t> ImageDataBuffe
105-
bool ImageDataBuffer::EncodeImage(const ImageEncodingMimeType mime_type,
106-
const double& quality,
107-
Vector<unsigned char>* encoded_image) const {
108-
+ if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
109-
+ // shuffle subchannel color data within the pixmap
110-
+ StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
111-
+ }
112-
return ImageEncoder::Encode(encoded_image, pixmap_, mime_type, quality);
113-
}
114-
115102
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
116103
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
117104
@@ -4,6 +4,8 @@
@@ -303,6 +290,28 @@ approach to change color components.
303290
bool IsStaticBitmapImage() const override { return true; }
304291

305292
// Methods overridden by all sub-classes
293+
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
294+
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
295+
@@ -14,6 +14,8 @@
296+
#include <stdio.h> // Needed by jpeglib.h
297+
298+
#include "jpeglib.h" // for JPEG_MAX_DIMENSION
299+
+#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
300+
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
301+
#include "third_party/libwebp/src/src/webp/encode.h" // for WEBP_MAX_DIMENSION
302+
303+
namespace blink {
304+
@@ -43,6 +45,10 @@ bool ImageEncoder::Encode(Vector<unsigne
305+
const SkPixmap& src,
306+
ImageEncodingMimeType mime_type,
307+
double quality) {
308+
+ if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
309+
+ // shuffle subchannel color data within the pixmap
310+
+ StaticBitmapImage::ShuffleSubchannelColorData(src.writable_addr(), src.info(), 0, 0);
311+
+ }
312+
switch (mime_type) {
313+
case kMimeTypeJpeg: {
314+
SkJpegEncoder::Options options;
306315
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
307316
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
308317
@@ -2260,6 +2260,9 @@

patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
#include "build/chromeos_buildflags.h"
1616
--- /dev/null
1717
+++ b/chrome/browser/existing_switch_flag_choices.h
18-
@@ -0,0 +1,21 @@
18+
@@ -0,0 +1,19 @@
1919
+// Copyright (c) 2023 The ungoogled-chromium Authors. All rights reserved.
2020
+// Use of this source code is governed by a BSD-style license that can be
2121
+// found in the LICENSE file.
2222
+
2323
+#ifndef CHROME_BROWSER_EXISTING_SWITCH_FLAG_CHOICES_H_
2424
+#define CHROME_BROWSER_EXISTING_SWITCH_FLAG_CHOICES_H_
2525
+const FeatureEntry::Choice kWebRTCIPPolicy[] = {
26-
+ {"Disable non proxied udp",
27-
+ "webrtc-ip-handling-policy",
28-
+ "disable_non_proxied_udp"},
26+
+ {"Disable non proxied udp", "", ""},
2927
+ {"Default",
3028
+ "webrtc-ip-handling-policy",
3129
+ "default"},

patches/extra/ungoogled-chromium/remove-uneeded-ui.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
--- a/chrome/app/settings_chromium_strings.grdp
3636
+++ b/chrome/app/settings_chromium_strings.grdp
37-
@@ -369,13 +369,13 @@
37+
@@ -372,13 +372,13 @@
3838

3939
<!-- Performance Page -->
4040
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -323,7 +323,7 @@
323323
<settings-toggle-button id="spellCheckControl"
324324
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
325325
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
326-
@@ -179,10 +179,6 @@ export class SettingsPersonalizationOpti
326+
@@ -201,10 +201,6 @@ export class SettingsPersonalizationOpti
327327
'chrome-signin-user-choice-info-change',
328328
this.setChromeSigninUserChoiceInfo_.bind(this));
329329
// </if>
@@ -566,7 +566,7 @@
566566

567567
html_source->AddString("discardRingTreatmentLearnMoreUrl",
568568
chrome::kDiscardRingTreatmentLearnMoreUrl);
569-
@@ -3468,7 +3443,7 @@ void AddSiteSettingsStrings(content::Web
569+
@@ -3471,7 +3446,7 @@ void AddSiteSettingsStrings(content::Web
570570
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
571571

572572
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -577,7 +577,7 @@
577577
html_source->AddBoolean(
578578
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
579579
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
580-
@@ -619,27 +619,20 @@ SettingsUI::SettingsUI(content::WebUI* w
580+
@@ -627,27 +627,20 @@ SettingsUI::SettingsUI(content::WebUI* w
581581
autofill::AutofillAiAction::kListEntityInstancesInSettings)},
582582
};
583583

0 commit comments

Comments
 (0)