mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
ffd2224bbe
* fix: backport boringssl patches for node compat * refactor: prevent node macros from overriding base (#17178) * fix: backport boring ssl patch OPENSSL_clear_free * refactor: load electron builtin modules with process._linkedBinding (#17247) * refactor: load electron builtin modules with process._linkedBinding NODE_BUILTING_MODULE_CONTEXT_AWARE and process.binding are removed in https://github.com/nodejs/node/pull/25829. This changes uses the alternative available without any functionality change. * chore: roll node * fix: add boringssl backport to support node upgrade * fix: Update node_includes.h, add DCHECK macros * fix: Update node Debug Options parser usage * fix: Fix asar setup * fix: using v8Util in isolated context * fix: make "process" available in preload scripts * fix: use proper options parser and remove setting of _breakFirstLine _breakFirstLine was being set on the process, but that has changed in node 12 and so is no longer needed. Node will handle it properly when --inspect-brk is provided * fix: process.binding => _linkedBinding in sandboxed isolated preload * chore: update node dep sha * fix: make original-fs work with streams
59 lines
2.0 KiB
C++
59 lines
2.0 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "atom/browser/web_contents_preferences.h"
|
|
#include "atom/browser/web_contents_zoom_controller.h"
|
|
#include "atom/browser/web_view_manager.h"
|
|
#include "atom/common/native_mate_converters/content_converter.h"
|
|
#include "atom/common/native_mate_converters/value_converter.h"
|
|
#include "atom/common/options_switches.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "native_mate/dictionary.h"
|
|
|
|
// Must be the last in the includes list.
|
|
// See https://github.com/electron/electron/issues/10363
|
|
#include "atom/common/node_includes.h"
|
|
|
|
using atom::WebContentsPreferences;
|
|
|
|
namespace {
|
|
|
|
void AddGuest(int guest_instance_id,
|
|
int element_instance_id,
|
|
content::WebContents* embedder,
|
|
content::WebContents* guest_web_contents,
|
|
const base::DictionaryValue& options) {
|
|
auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
|
|
if (manager)
|
|
manager->AddGuest(guest_instance_id, element_instance_id, embedder,
|
|
guest_web_contents);
|
|
|
|
double zoom_factor;
|
|
if (options.GetDouble(atom::options::kZoomFactor, &zoom_factor)) {
|
|
atom::WebContentsZoomController::FromWebContents(guest_web_contents)
|
|
->SetDefaultZoomFactor(zoom_factor);
|
|
}
|
|
|
|
WebContentsPreferences::From(guest_web_contents)->Merge(options);
|
|
}
|
|
|
|
void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
|
|
auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
|
|
if (manager)
|
|
manager->RemoveGuest(guest_instance_id);
|
|
}
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
|
dict.SetMethod("addGuest", &AddGuest);
|
|
dict.SetMethod("removeGuest", &RemoveGuest);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize)
|