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.patch6318359
patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420
patch 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:6326575
patch 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 |6295214
NB: 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>
This commit is contained in:
parent
530ccfe350
commit
458b14b8ed
79 changed files with 490 additions and 334 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue