chore: bump chromium to 1a093e6a0cb5e72ba78990fe39824 (master) (#24575)
This commit is contained in:
parent
d4a4269989
commit
2fb14f53fe
81 changed files with 407 additions and 346 deletions
|
@ -594,7 +594,7 @@ void SetIsolatedWorldInfo(v8::Local<v8::Value> window,
|
|||
blink::WebString::FromUTF8(origin_url));
|
||||
info.content_security_policy = blink::WebString::FromUTF8(security_policy);
|
||||
info.human_readable_name = blink::WebString::FromUTF8(name);
|
||||
render_frame->GetWebFrame()->SetIsolatedWorldInfo(world_id, info);
|
||||
blink::SetIsolatedWorldInfo(world_id, info);
|
||||
}
|
||||
|
||||
blink::WebCacheResourceTypeStats GetResourceUsage(v8::Isolate* isolate) {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include "shell/renderer/content_settings_observer.h"
|
||||
|
||||
#include "base/command_line.h"
|
||||
#include "content/public/renderer/render_frame.h"
|
||||
#include "shell/common/options_switches.h"
|
||||
#include "third_party/blink/public/platform/url_conversion.h"
|
||||
|
|
|
@ -137,7 +137,7 @@ void ElectronRenderFrameObserver::CreateIsolatedWorldContext() {
|
|||
blink::WebString::FromUTF8("Electron Isolated Context");
|
||||
// Setup document's origin policy in isolated world
|
||||
info.security_origin = frame->GetDocument().GetSecurityOrigin();
|
||||
frame->SetIsolatedWorldInfo(WorldIDs::ISOLATED_WORLD_ID, info);
|
||||
blink::SetIsolatedWorldInfo(WorldIDs::ISOLATED_WORLD_ID, info);
|
||||
|
||||
// Create initial script context in isolated world
|
||||
blink::WebScriptSource source("void 0");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue