chore: bump chromium to 136.0.7062.0 (#45987)
* chore: bump chromium to 135.0.7049.7 (main) (#45900) chore: bump chromium in DEPS to 135.0.7049.7 (cherry picked from commitbb1c3dff21) * chore: bump chromium to 136.0.7053.1 (main) (#45906) * chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461* 6313744: Migrate views::Background factory methods to ColorVariant |6313744* 6314545: Remove multiple argument support from base::ToString() |6314545* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362* 6308998: Add SettingAccess structured metrics event for DevTools |6308998* 6295214: Remove redundant state field in per-extension preferences |6295214NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit458b14b8ed) * chore!: bump chromium to 136.0.7054.0 (main) (#45923) * chore: bump chromium in DEPS to 136.0.7054.0 * chore: update allow_in-process_windows_to_have_different_web_prefs.patch Xref:5906158patch applied manually due to context shear * chore: e patches all * refactor!: Session.clearStorageData(syncable) Xref:6309405Remove syncable type from opts.quota in Session.clearStorageData(opts) because it that category has been removed upstream. BREAKING CHANGE: Removed ses.clearDataStorage({ quota: 'syncable' }) * docs: deprecate Session.clearDataStorage({ quota }) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit20414f66ca) * chore: bump chromium to 136.0.7058.1 (main) (#45928) * chore: bump chromium in DEPS to 136.0.7056.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch no manual changes; patch applied with fuzz * chore: update fix_adapt_exclusive_access_for_electron_needs.patch patch applied manually due to context shear 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958* chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch no manual changes; patch applied with fuzz 6311876: Expose captured surface resolution for MacOS |6311876* chore: e patches all * 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958* 6326673: views: Delete the single-parameter Widget::InitParams constructor. |6326673*6331102* 6331102: [A11yPerformance] Rename AXMode::kScreenReader to kExtendedProperties |6331102Sync with shell/browser/ui/webui/accessibility_ui.cc to upstream chrome/browser/accessibility/accessibility_ui.cc changes in 4af8657 * chore: bump Chromium 136.0.7058.1 (#45933) chore: bump chromium in DEPS to 136.0.7058.1 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commitb0c11371e0) * chore: bump chromium to 136.0.7062.0 (main) (#45957) * chore: bump chromium in DEPS to 136.0.7059.0 * chore: bump chromium in DEPS to 136.0.7060.0 * chore: bump chromium in DEPS to 136.0.7062.0 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> (cherry picked from commit2de8fd7d93) * fixup! chore: bump chromium to 136.0.7053.1 (main) (#45906) chore: fix patch shear * chore: remove cherry-pick-521faebc8a7c.patch fixed upstream @ 521faeb 6334632: Disable setting primtive restart for WebGL in the cmd decoder. |6334632* chore: remove cherry-pick-9dacf5694dfd.patch fixed upstream @ 9dacf56 6330188: Move WebGL primitive restart state setting to the GPU process. |6330188* chore: e patches all --------- Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
This commit is contained in:
John Kleinschmidt
GitHub
parent
c62db7d49d
commit
98adbbb593
96 changed files with 599 additions and 556 deletions
|
|
@ -152,8 +152,6 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
|
|||
auto type = base::ToLowerASCII(it);
|
||||
if (type == "temporary")
|
||||
quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
|
||||
else if (type == "syncable")
|
||||
quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
|
||||
}
|
||||
return quota_mask;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -346,7 +346,8 @@ std::vector<v8::Local<v8::Value>> View::GetChildren() {
|
|||
void View::SetBackgroundColor(std::optional<WrappedSkColor> color) {
|
||||
if (!view_)
|
||||
return;
|
||||
view_->SetBackground(color ? views::CreateSolidBackground(*color) : nullptr);
|
||||
view_->SetBackground(color ? views::CreateSolidBackground({*color})
|
||||
: nullptr);
|
||||
}
|
||||
|
||||
void View::SetBorderRadius(int radius) {
|
||||
|
|
|
|||
|
|
@ -1400,7 +1400,7 @@ bool WebContents::IsFullscreen() const {
|
|||
return owner_window()->IsFullscreen() || is_html_fullscreen();
|
||||
}
|
||||
|
||||
void WebContents::EnterFullscreen(const GURL& url,
|
||||
void WebContents::EnterFullscreen(const url::Origin& origin,
|
||||
ExclusiveAccessBubbleType bubble_type,
|
||||
const int64_t display_id) {}
|
||||
|
||||
|
|
|
|||
|
|
@ -684,7 +684,7 @@ class WebContents final : public ExclusiveAccessContext,
|
|||
// ExclusiveAccessContext:
|
||||
Profile* GetProfile() override;
|
||||
bool IsFullscreen() const override;
|
||||
void EnterFullscreen(const GURL& url,
|
||||
void EnterFullscreen(const url::Origin& origin,
|
||||
ExclusiveAccessBubbleType bubble_type,
|
||||
const int64_t display_id) override;
|
||||
void ExitFullscreen() override {}
|
||||
|
|
|
|||
|
|
@ -178,16 +178,8 @@ void ElectronExtensionLoader::PreAddExtension(const Extension* extension,
|
|||
// The extension might be disabled if a previous reload attempt failed. In
|
||||
// that case, we want to remove that disable reason.
|
||||
ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser_context_);
|
||||
if (extension_prefs->IsExtensionDisabled(extension->id()) &&
|
||||
extension_prefs->HasDisableReason(extension->id(),
|
||||
disable_reason::DISABLE_RELOAD)) {
|
||||
extension_prefs->RemoveDisableReason(extension->id(),
|
||||
disable_reason::DISABLE_RELOAD);
|
||||
// Only re-enable the extension if there are no other disable reasons.
|
||||
if (extension_prefs->GetDisableReasons(extension->id()).empty()) {
|
||||
extension_prefs->SetExtensionEnabled(extension->id());
|
||||
}
|
||||
}
|
||||
extension_prefs->RemoveDisableReason(extension->id(),
|
||||
disable_reason::DISABLE_RELOAD);
|
||||
}
|
||||
|
||||
void ElectronExtensionLoader::PostActivateExtension(
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/frame_tree_node_id.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "content/public/common/user_agent.h"
|
||||
#include "extensions/browser/api/core_extensions_browser_api_provider.h"
|
||||
#include "extensions/browser/api/extensions_api_client.h"
|
||||
#include "extensions/browser/component_extension_resource_manager.h"
|
||||
|
|
|
|||
|
|
@ -65,53 +65,6 @@ content::WebContents* ElectronMessagingDelegate::GetWebContentsByTabId(
|
|||
return contents->web_contents();
|
||||
}
|
||||
|
||||
std::unique_ptr<MessagePort> ElectronMessagingDelegate::CreateReceiverForTab(
|
||||
base::WeakPtr<MessagePort::ChannelDelegate> channel_delegate,
|
||||
const std::string& extension_id,
|
||||
const PortId& receiver_port_id,
|
||||
content::WebContents* receiver_contents,
|
||||
int receiver_frame_id,
|
||||
const std::string& receiver_document_id) {
|
||||
// Frame ID -1 is every frame in the tab.
|
||||
bool include_child_frames =
|
||||
receiver_frame_id == -1 && receiver_document_id.empty();
|
||||
|
||||
content::RenderFrameHost* receiver_rfh = nullptr;
|
||||
if (include_child_frames) {
|
||||
// The target is the active outermost main frame of the WebContents.
|
||||
receiver_rfh = receiver_contents->GetPrimaryMainFrame();
|
||||
} else if (!receiver_document_id.empty()) {
|
||||
ExtensionApiFrameIdMap::DocumentId document_id =
|
||||
ExtensionApiFrameIdMap::DocumentIdFromString(receiver_document_id);
|
||||
|
||||
// Return early for invalid documentIds.
|
||||
if (!document_id)
|
||||
return nullptr;
|
||||
|
||||
receiver_rfh =
|
||||
ExtensionApiFrameIdMap::Get()->GetRenderFrameHostByDocumentId(
|
||||
document_id);
|
||||
|
||||
// If both |document_id| and |receiver_frame_id| are provided they
|
||||
// should find the same RenderFrameHost, if not return early.
|
||||
if (receiver_frame_id != -1 &&
|
||||
ExtensionApiFrameIdMap::GetRenderFrameHostById(
|
||||
receiver_contents, receiver_frame_id) != receiver_rfh) {
|
||||
return nullptr;
|
||||
}
|
||||
} else {
|
||||
DCHECK_GT(receiver_frame_id, -1);
|
||||
receiver_rfh = ExtensionApiFrameIdMap::GetRenderFrameHostById(
|
||||
receiver_contents, receiver_frame_id);
|
||||
}
|
||||
if (!receiver_rfh)
|
||||
return nullptr;
|
||||
|
||||
return ExtensionMessagePort::CreateForTab(channel_delegate, receiver_port_id,
|
||||
extension_id, receiver_rfh,
|
||||
include_child_frames);
|
||||
}
|
||||
|
||||
std::unique_ptr<MessagePort>
|
||||
ElectronMessagingDelegate::CreateReceiverForNativeApp(
|
||||
content::BrowserContext* browser_context,
|
||||
|
|
|
|||
|
|
@ -32,13 +32,6 @@ class ElectronMessagingDelegate : public MessagingDelegate {
|
|||
content::WebContents* GetWebContentsByTabId(
|
||||
content::BrowserContext* browser_context,
|
||||
int tab_id) override;
|
||||
std::unique_ptr<MessagePort> CreateReceiverForTab(
|
||||
base::WeakPtr<MessagePort::ChannelDelegate> channel_delegate,
|
||||
const std::string& extension_id,
|
||||
const PortId& receiver_port_id,
|
||||
content::WebContents* receiver_contents,
|
||||
int receiver_frame_id,
|
||||
const std::string& receiver_document_id) override;
|
||||
std::unique_ptr<MessagePort> CreateReceiverForNativeApp(
|
||||
content::BrowserContext* browser_context,
|
||||
base::WeakPtr<MessagePort::ChannelDelegate> channel_delegate,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include "content/public/browser/navigation_entry.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
#include "content/public/common/user_agent.h"
|
||||
#include "electron/grit/electron_resources.h"
|
||||
#include "net/base/net_errors.h"
|
||||
#include "net/socket/stream_socket.h"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "base/uuid.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
|
||||
#include "components/embedder_support/user_agent_utils.h"
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/prefs/scoped_user_pref_update.h"
|
||||
|
|
@ -35,7 +36,6 @@
|
|||
#include "content/public/browser/render_view_host.h"
|
||||
#include "content/public/browser/shared_cors_origin_access_list.h"
|
||||
#include "content/public/browser/storage_partition.h"
|
||||
#include "content/public/common/user_agent.h"
|
||||
#include "ipc/ipc_channel.h"
|
||||
#include "net/http/http_response_headers.h"
|
||||
#include "net/http/http_status_code.h"
|
||||
|
|
@ -139,9 +139,10 @@ double GetNextZoomLevel(double level, bool out) {
|
|||
}
|
||||
|
||||
GURL GetRemoteBaseURL() {
|
||||
return GURL(absl::StrFormat("%s%s/%s/", kChromeUIDevToolsRemoteFrontendBase,
|
||||
kChromeUIDevToolsRemoteFrontendPath,
|
||||
content::GetChromiumGitRevision().c_str()));
|
||||
return GURL(
|
||||
absl::StrFormat("%s%s/%s/", kChromeUIDevToolsRemoteFrontendBase,
|
||||
kChromeUIDevToolsRemoteFrontendPath,
|
||||
embedder_support::GetChromiumGitRevision().c_str()));
|
||||
}
|
||||
|
||||
GURL GetDevToolsURL(bool can_dock) {
|
||||
|
|
@ -816,12 +817,6 @@ void InspectableWebContents::DispatchProtocolMessageFromDevToolsFrontend(
|
|||
agent_host_->DispatchProtocolMessage(this, base::as_byte_span(message));
|
||||
}
|
||||
|
||||
void InspectableWebContents::SendJsonRequest(DispatchCallback callback,
|
||||
const std::string& browser_id,
|
||||
const std::string& url) {
|
||||
std::move(callback).Run(nullptr);
|
||||
}
|
||||
|
||||
void InspectableWebContents::GetPreferences(DispatchCallback callback) {
|
||||
const base::Value& prefs = pref_service_->GetValue(kDevToolsPreferences);
|
||||
std::move(callback).Run(&prefs);
|
||||
|
|
|
|||
|
|
@ -148,9 +148,6 @@ class InspectableWebContents
|
|||
int min,
|
||||
int exclusive_max,
|
||||
int buckets) override {}
|
||||
void SendJsonRequest(DispatchCallback callback,
|
||||
const std::string& browser_id,
|
||||
const std::string& url) override;
|
||||
void RegisterPreference(const std::string& name,
|
||||
const RegisterOptions& options) override {}
|
||||
void GetPreferences(DispatchCallback callback) override;
|
||||
|
|
@ -183,6 +180,7 @@ class InspectableWebContents
|
|||
void RecordDrag(const DragEvent& event) override {}
|
||||
void RecordChange(const ChangeEvent& event) override {}
|
||||
void RecordKeyDown(const KeyDownEvent& event) override {}
|
||||
void RecordSettingAccess(const SettingAccessEvent& event) override {}
|
||||
void ShowSurvey(DispatchCallback callback,
|
||||
const std::string& trigger) override {}
|
||||
void CanShowSurvey(DispatchCallback callback,
|
||||
|
|
|
|||
|
|
@ -73,7 +73,9 @@ void AutofillPopupView::Show() {
|
|||
// a weak pointer to hold the reference and don't have to worry about
|
||||
// deletion.
|
||||
auto* widget = new views::Widget;
|
||||
views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
|
||||
views::Widget::InitParams params{
|
||||
views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET,
|
||||
views::Widget::InitParams::TYPE_POPUP};
|
||||
params.delegate = this;
|
||||
params.parent = parent_widget_->GetNativeView();
|
||||
params.z_order = ui::ZOrderLevel::kFloatingUIElement;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
|
|||
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
|
||||
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
SetBackground(views::CreateThemedSolidBackground(ui::kColorMenuBackground));
|
||||
SetBackground(views::CreateSolidBackground(ui::kColorMenuBackground));
|
||||
#endif
|
||||
RefreshColorCache(theme);
|
||||
UpdateViewColors();
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ constexpr std::string_view kLocked = "locked";
|
|||
constexpr std::string_view kNative = "native";
|
||||
constexpr std::string_view kPage = "page";
|
||||
constexpr std::string_view kPDFPrinting = "pdfPrinting";
|
||||
constexpr std::string_view kScreenReader = "screenreader";
|
||||
constexpr std::string_view kExtendedProperties = "extendedProperties";
|
||||
constexpr std::string_view kShowOrRefreshTree = "showOrRefreshTree";
|
||||
constexpr std::string_view kText = "text";
|
||||
constexpr std::string_view kWeb = "web";
|
||||
|
|
@ -165,7 +165,7 @@ void HandleAccessibilityRequestCallback(
|
|||
bool native = mode.has_mode(ui::AXMode::kNativeAPIs);
|
||||
bool web = mode.has_mode(ui::AXMode::kWebContents);
|
||||
bool text = mode.has_mode(ui::AXMode::kInlineTextBoxes);
|
||||
bool screenreader = mode.has_mode(ui::AXMode::kScreenReader);
|
||||
bool extendedProperties = mode.has_mode(ui::AXMode::kExtendedProperties);
|
||||
bool html = mode.has_mode(ui::AXMode::kHTML);
|
||||
bool pdf_printing = mode.has_mode(ui::AXMode::kPDFPrinting);
|
||||
|
||||
|
|
@ -174,12 +174,12 @@ void HandleAccessibilityRequestCallback(
|
|||
data.Set(kNative, is_native_enabled ? (native ? kOn : kOff) : kDisabled);
|
||||
data.Set(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled);
|
||||
|
||||
// The "text", "screenreader" and "html" flags are only
|
||||
// The "text", "extendedProperties" and "html" flags are only
|
||||
// meaningful if "web" is enabled.
|
||||
bool is_web_enabled = is_native_enabled && web;
|
||||
data.Set(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled);
|
||||
data.Set(kScreenReader,
|
||||
is_web_enabled ? (screenreader ? kOn : kOff) : kDisabled);
|
||||
data.Set(kExtendedProperties,
|
||||
is_web_enabled ? (extendedProperties ? kOn : kOff) : kDisabled);
|
||||
data.Set(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled);
|
||||
|
||||
// The "pdfPrinting" flag is independent of the others.
|
||||
|
|
@ -246,7 +246,7 @@ void HandleAccessibilityRequestCallback(
|
|||
|
||||
base::Value::Dict descriptor = BuildTargetDescriptor(rvh);
|
||||
descriptor.Set(kNative, is_native_enabled);
|
||||
descriptor.Set(kScreenReader, is_web_enabled && screenreader);
|
||||
descriptor.Set(kExtendedProperties, is_web_enabled && extendedProperties);
|
||||
descriptor.Set(kWeb, is_web_enabled);
|
||||
page_list.Append(std::move(descriptor));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue