
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
121 lines
4.4 KiB
C++
121 lines
4.4 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_view_guest_delegate.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "atom/browser/api/atom_api_web_contents.h"
|
|
#include "atom/common/native_mate_converters/gurl_converter.h"
|
|
#include "content/browser/web_contents/web_contents_impl.h"
|
|
#include "content/public/browser/navigation_handle.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/render_widget_host.h"
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
|
|
namespace atom {
|
|
|
|
WebViewGuestDelegate::WebViewGuestDelegate(content::WebContents* embedder,
|
|
api::WebContents* api_web_contents)
|
|
: embedder_web_contents_(embedder), api_web_contents_(api_web_contents) {}
|
|
|
|
WebViewGuestDelegate::~WebViewGuestDelegate() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
void WebViewGuestDelegate::AttachToIframe(
|
|
content::WebContents* embedder_web_contents,
|
|
int embedder_frame_id) {
|
|
embedder_web_contents_ = embedder_web_contents;
|
|
|
|
int embedder_process_id =
|
|
embedder_web_contents_->GetMainFrame()->GetProcess()->GetID();
|
|
auto* embedder_frame =
|
|
content::RenderFrameHost::FromID(embedder_process_id, embedder_frame_id);
|
|
DCHECK_EQ(embedder_web_contents_,
|
|
content::WebContents::FromRenderFrameHost(embedder_frame));
|
|
|
|
// Attach this inner WebContents |guest_web_contents| to the outer
|
|
// WebContents |embedder_web_contents|. The outer WebContents's
|
|
// frame |embedder_frame| hosts the inner WebContents.
|
|
api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
|
|
embedder_web_contents_, embedder_frame);
|
|
|
|
ResetZoomController();
|
|
|
|
embedder_zoom_controller_ =
|
|
WebContentsZoomController::FromWebContents(embedder_web_contents_);
|
|
embedder_zoom_controller_->AddObserver(this);
|
|
auto* zoom_controller = api_web_contents_->GetZoomController();
|
|
zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
|
|
|
|
api_web_contents_->Emit("did-attach");
|
|
}
|
|
|
|
void WebViewGuestDelegate::DidDetach() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
|
|
return embedder_web_contents_;
|
|
}
|
|
|
|
void WebViewGuestDelegate::OnZoomLevelChanged(
|
|
content::WebContents* web_contents,
|
|
double level,
|
|
bool is_temporary) {
|
|
if (web_contents == GetOwnerWebContents()) {
|
|
if (is_temporary) {
|
|
api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(level);
|
|
} else {
|
|
api_web_contents_->GetZoomController()->SetZoomLevel(level);
|
|
}
|
|
// Change the default zoom factor to match the embedders' new zoom level.
|
|
double zoom_factor = content::ZoomLevelToZoomFactor(level);
|
|
api_web_contents_->GetZoomController()->SetDefaultZoomFactor(zoom_factor);
|
|
}
|
|
}
|
|
|
|
void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
void WebViewGuestDelegate::ResetZoomController() {
|
|
if (embedder_zoom_controller_) {
|
|
embedder_zoom_controller_->RemoveObserver(this);
|
|
embedder_zoom_controller_ = nullptr;
|
|
}
|
|
}
|
|
|
|
content::RenderWidgetHost* WebViewGuestDelegate::GetOwnerRenderWidgetHost() {
|
|
return embedder_web_contents_->GetRenderViewHost()->GetWidget();
|
|
}
|
|
|
|
content::SiteInstance* WebViewGuestDelegate::GetOwnerSiteInstance() {
|
|
return embedder_web_contents_->GetSiteInstance();
|
|
}
|
|
|
|
content::WebContents* WebViewGuestDelegate::CreateNewGuestWindow(
|
|
const content::WebContents::CreateParams& create_params) {
|
|
// Code below mirrors what content::WebContentsImpl::CreateNewWindow
|
|
// does for non-guest sources
|
|
content::WebContents::CreateParams guest_params(create_params);
|
|
guest_params.initial_size =
|
|
embedder_web_contents_->GetContainerBounds().size();
|
|
guest_params.context = embedder_web_contents_->GetNativeView();
|
|
std::unique_ptr<content::WebContents> guest_contents =
|
|
content::WebContents::Create(guest_params);
|
|
content::RenderWidgetHost* render_widget_host =
|
|
guest_contents->GetRenderViewHost()->GetWidget();
|
|
auto* guest_contents_impl =
|
|
static_cast<content::WebContentsImpl*>(guest_contents.release());
|
|
guest_contents_impl->GetView()->CreateViewForWidget(render_widget_host,
|
|
false);
|
|
|
|
return guest_contents_impl;
|
|
}
|
|
|
|
} // namespace atom
|