chore: remove unused element_instance_id_to_guest_map_ from WebViewManager (#28979)
This commit is contained in:
parent
3d6343ed51
commit
a0589ca5d7
5 changed files with 4 additions and 45 deletions
|
@ -216,7 +216,7 @@ const attachGuest = function (event: Electron.IpcMainInvokeEvent,
|
||||||
|
|
||||||
watchEmbedder(embedder);
|
watchEmbedder(embedder);
|
||||||
|
|
||||||
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences);
|
webViewManager.addGuest(guestInstanceId, embedder, guest, webPreferences);
|
||||||
guest.attachToIframe(embedder, embedderFrameId);
|
guest.attachToIframe(embedder, embedderFrameId);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,14 +17,12 @@ using electron::WebContentsPreferences;
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void AddGuest(int guest_instance_id,
|
void AddGuest(int guest_instance_id,
|
||||||
int element_instance_id,
|
|
||||||
content::WebContents* embedder,
|
content::WebContents* embedder,
|
||||||
content::WebContents* guest_web_contents,
|
content::WebContents* guest_web_contents,
|
||||||
const base::DictionaryValue& options) {
|
const base::DictionaryValue& options) {
|
||||||
auto* manager = electron::WebViewManager::GetWebViewManager(embedder);
|
auto* manager = electron::WebViewManager::GetWebViewManager(embedder);
|
||||||
if (manager)
|
if (manager)
|
||||||
manager->AddGuest(guest_instance_id, element_instance_id, embedder,
|
manager->AddGuest(guest_instance_id, embedder, guest_web_contents);
|
||||||
guest_web_contents);
|
|
||||||
|
|
||||||
double zoom_factor;
|
double zoom_factor;
|
||||||
if (options.GetDouble(electron::options::kZoomFactor, &zoom_factor)) {
|
if (options.GetDouble(electron::options::kZoomFactor, &zoom_factor)) {
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
|
|
||||||
#include "shell/browser/web_view_manager.h"
|
#include "shell/browser/web_view_manager.h"
|
||||||
|
|
||||||
#include "content/public/browser/render_frame_host.h"
|
|
||||||
#include "content/public/browser/render_process_host.h"
|
|
||||||
#include "content/public/browser/web_contents.h"
|
#include "content/public/browser/web_contents.h"
|
||||||
#include "shell/browser/electron_browser_context.h"
|
#include "shell/browser/electron_browser_context.h"
|
||||||
|
|
||||||
|
@ -16,27 +14,13 @@ WebViewManager::WebViewManager() = default;
|
||||||
WebViewManager::~WebViewManager() = default;
|
WebViewManager::~WebViewManager() = default;
|
||||||
|
|
||||||
void WebViewManager::AddGuest(int guest_instance_id,
|
void WebViewManager::AddGuest(int guest_instance_id,
|
||||||
int element_instance_id,
|
|
||||||
content::WebContents* embedder,
|
content::WebContents* embedder,
|
||||||
content::WebContents* web_contents) {
|
content::WebContents* web_contents) {
|
||||||
web_contents_embedder_map_[guest_instance_id] = {web_contents, embedder};
|
web_contents_embedder_map_[guest_instance_id] = {web_contents, embedder};
|
||||||
|
|
||||||
// Map the element in embedder to guest.
|
|
||||||
int owner_process_id = embedder->GetMainFrame()->GetProcess()->GetID();
|
|
||||||
ElementInstanceKey key(owner_process_id, element_instance_id);
|
|
||||||
element_instance_id_to_guest_map_[key] = guest_instance_id;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebViewManager::RemoveGuest(int guest_instance_id) {
|
void WebViewManager::RemoveGuest(int guest_instance_id) {
|
||||||
if (web_contents_embedder_map_.erase(guest_instance_id) == 0)
|
web_contents_embedder_map_.erase(guest_instance_id);
|
||||||
return;
|
|
||||||
|
|
||||||
// Remove the record of element in embedder too.
|
|
||||||
for (const auto& element : element_instance_id_to_guest_map_)
|
|
||||||
if (element.second == guest_instance_id) {
|
|
||||||
element_instance_id_to_guest_map_.erase(element.first);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
content::WebContents* WebViewManager::GetEmbedder(int guest_instance_id) {
|
content::WebContents* WebViewManager::GetEmbedder(int guest_instance_id) {
|
||||||
|
|
|
@ -17,7 +17,6 @@ class WebViewManager : public content::BrowserPluginGuestManager {
|
||||||
~WebViewManager() override;
|
~WebViewManager() override;
|
||||||
|
|
||||||
void AddGuest(int guest_instance_id,
|
void AddGuest(int guest_instance_id,
|
||||||
int element_instance_id,
|
|
||||||
content::WebContents* embedder,
|
content::WebContents* embedder,
|
||||||
content::WebContents* web_contents);
|
content::WebContents* web_contents);
|
||||||
void RemoveGuest(int guest_instance_id);
|
void RemoveGuest(int guest_instance_id);
|
||||||
|
@ -38,28 +37,6 @@ class WebViewManager : public content::BrowserPluginGuestManager {
|
||||||
// guest_instance_id => (web_contents, embedder)
|
// guest_instance_id => (web_contents, embedder)
|
||||||
std::map<int, WebContentsWithEmbedder> web_contents_embedder_map_;
|
std::map<int, WebContentsWithEmbedder> web_contents_embedder_map_;
|
||||||
|
|
||||||
struct ElementInstanceKey {
|
|
||||||
int embedder_process_id;
|
|
||||||
int element_instance_id;
|
|
||||||
|
|
||||||
ElementInstanceKey(int embedder_process_id, int element_instance_id)
|
|
||||||
: embedder_process_id(embedder_process_id),
|
|
||||||
element_instance_id(element_instance_id) {}
|
|
||||||
|
|
||||||
bool operator<(const ElementInstanceKey& other) const {
|
|
||||||
if (embedder_process_id != other.embedder_process_id)
|
|
||||||
return embedder_process_id < other.embedder_process_id;
|
|
||||||
return element_instance_id < other.element_instance_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const ElementInstanceKey& other) const {
|
|
||||||
return (embedder_process_id == other.embedder_process_id) &&
|
|
||||||
(element_instance_id == other.element_instance_id);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
// (embedder_process_id, element_instance_id) => guest_instance_id
|
|
||||||
std::map<ElementInstanceKey, int> element_instance_id_to_guest_map_;
|
|
||||||
|
|
||||||
DISALLOW_COPY_AND_ASSIGN(WebViewManager);
|
DISALLOW_COPY_AND_ASSIGN(WebViewManager);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
2
typings/internal-ambient.d.ts
vendored
2
typings/internal-ambient.d.ts
vendored
|
@ -97,7 +97,7 @@ declare namespace NodeJS {
|
||||||
}
|
}
|
||||||
|
|
||||||
interface WebViewManagerBinding {
|
interface WebViewManagerBinding {
|
||||||
addGuest(guestInstanceId: number, elementInstanceId: number, embedder: Electron.WebContents, guest: Electron.WebContents, webPreferences: Electron.WebPreferences): void;
|
addGuest(guestInstanceId: number, embedder: Electron.WebContents, guest: Electron.WebContents, webPreferences: Electron.WebPreferences): void;
|
||||||
removeGuest(embedder: Electron.WebContents, guestInstanceId: number): void;
|
removeGuest(embedder: Electron.WebContents, guestInstanceId: number): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue