chore: bump chromium to 102.0.4961.0 (main) (#33091)
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types |1824792
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref:3329593
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref:3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref:3499818
* chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref:3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref:3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types |1880987
The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref:3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref:3500826
* 3509531: Make some public Blink media files private Ref:3509531
* 3497377: bluetooth: Add BluetoothDevice.forget() Ref:3497377
* chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref:3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf. Ref:3502592
* chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded()3457645
* chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref:3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref:3508375
* chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref:3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref:3526815
* chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref:3498914
* fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref:3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref:3536433
* 3111565: Relocated Page.printToPDF implementation to //components Xref:3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref:3520025
build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref:3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8c
Xref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h3511268
use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. |3510189
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
parent
92c5dedc76
commit
7e59d784a0
142 changed files with 998 additions and 754 deletions
|
@ -75,13 +75,40 @@ std::unique_ptr<MessagePort> ElectronMessagingDelegate::CreateReceiverForTab(
|
|||
const std::string& extension_id,
|
||||
const PortId& receiver_port_id,
|
||||
content::WebContents* receiver_contents,
|
||||
int receiver_frame_id) {
|
||||
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;
|
||||
content::RenderFrameHost* receiver_rfh =
|
||||
include_child_frames ? receiver_contents->GetMainFrame()
|
||||
: ExtensionApiFrameIdMap::GetRenderFrameHostById(
|
||||
receiver_contents, receiver_frame_id);
|
||||
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->GetMainFrame();
|
||||
} 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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue