e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
287 lines
11 KiB
C++
287 lines
11 KiB
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/web_contents_zoom_controller.h"
|
|
|
|
#include <string>
|
|
|
|
#include "content/public/browser/navigation_details.h"
|
|
#include "content/public/browser/navigation_entry.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/web_contents.h"
|
|
#include "content/public/browser/web_contents_user_data.h"
|
|
#include "content/public/common/page_type.h"
|
|
#include "net/base/url_util.h"
|
|
#include "third_party/blink/public/common/page/page_zoom.h"
|
|
|
|
namespace electron {
|
|
|
|
WebContentsZoomController::WebContentsZoomController(
|
|
content::WebContents* web_contents)
|
|
: content::WebContentsObserver(web_contents),
|
|
content::WebContentsUserData<WebContentsZoomController>(*web_contents) {
|
|
default_zoom_factor_ = kPageZoomEpsilon;
|
|
host_zoom_map_ = content::HostZoomMap::GetForWebContents(web_contents);
|
|
}
|
|
|
|
WebContentsZoomController::~WebContentsZoomController() = default;
|
|
|
|
void WebContentsZoomController::AddObserver(
|
|
WebContentsZoomController::Observer* observer) {
|
|
observers_.AddObserver(observer);
|
|
}
|
|
|
|
void WebContentsZoomController::RemoveObserver(
|
|
WebContentsZoomController::Observer* observer) {
|
|
observers_.RemoveObserver(observer);
|
|
}
|
|
|
|
void WebContentsZoomController::SetEmbedderZoomController(
|
|
WebContentsZoomController* controller) {
|
|
embedder_zoom_controller_ = controller;
|
|
}
|
|
|
|
void WebContentsZoomController::SetZoomLevel(double level) {
|
|
if (!web_contents()->GetPrimaryMainFrame()->IsRenderFrameLive() ||
|
|
blink::PageZoomValuesEqual(GetZoomLevel(), level) ||
|
|
zoom_mode_ == ZoomMode::kDisabled)
|
|
return;
|
|
|
|
int render_process_id =
|
|
web_contents()->GetRenderViewHost()->GetProcess()->GetID();
|
|
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
|
|
|
if (zoom_mode_ == ZoomMode::kManual) {
|
|
zoom_level_ = level;
|
|
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), level, true);
|
|
|
|
return;
|
|
}
|
|
|
|
content::HostZoomMap* zoom_map =
|
|
content::HostZoomMap::GetForWebContents(web_contents());
|
|
if (zoom_mode_ == ZoomMode::kIsolated ||
|
|
zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
|
|
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id, level);
|
|
// Notify observers of zoom level changes.
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), level, true);
|
|
} else {
|
|
content::HostZoomMap::SetZoomLevel(web_contents(), level);
|
|
|
|
// Notify observers of zoom level changes.
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), level, false);
|
|
}
|
|
}
|
|
|
|
double WebContentsZoomController::GetZoomLevel() {
|
|
return zoom_mode_ == ZoomMode::kManual
|
|
? zoom_level_
|
|
: content::HostZoomMap::GetZoomLevel(web_contents());
|
|
}
|
|
|
|
void WebContentsZoomController::SetDefaultZoomFactor(double factor) {
|
|
default_zoom_factor_ = factor;
|
|
}
|
|
|
|
double WebContentsZoomController::GetDefaultZoomFactor() {
|
|
return default_zoom_factor_;
|
|
}
|
|
|
|
void WebContentsZoomController::SetTemporaryZoomLevel(double level) {
|
|
old_process_id_ = web_contents()->GetRenderViewHost()->GetProcess()->GetID();
|
|
old_view_id_ = web_contents()->GetRenderViewHost()->GetRoutingID();
|
|
host_zoom_map_->SetTemporaryZoomLevel(old_process_id_, old_view_id_, level);
|
|
// Notify observers of zoom level changes.
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), level, true);
|
|
}
|
|
|
|
bool WebContentsZoomController::UsesTemporaryZoomLevel() {
|
|
int render_process_id =
|
|
web_contents()->GetRenderViewHost()->GetProcess()->GetID();
|
|
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
|
return host_zoom_map_->UsesTemporaryZoomLevel(render_process_id,
|
|
render_view_id);
|
|
}
|
|
|
|
void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
|
|
if (new_mode == zoom_mode_)
|
|
return;
|
|
|
|
content::HostZoomMap* zoom_map =
|
|
content::HostZoomMap::GetForWebContents(web_contents());
|
|
int render_process_id =
|
|
web_contents()->GetRenderViewHost()->GetProcess()->GetID();
|
|
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
|
double original_zoom_level = GetZoomLevel();
|
|
|
|
switch (new_mode) {
|
|
case ZoomMode::kDefault: {
|
|
content::NavigationEntry* entry =
|
|
web_contents()->GetController().GetLastCommittedEntry();
|
|
|
|
if (entry) {
|
|
GURL url = content::HostZoomMap::GetURLFromEntry(entry);
|
|
std::string host = net::GetHostOrSpecFromURL(url);
|
|
|
|
if (zoom_map->HasZoomLevel(url.scheme(), host)) {
|
|
// If there are other tabs with the same origin, then set this tab's
|
|
// zoom level to match theirs. The temporary zoom level will be
|
|
// cleared below, but this call will make sure this tab re-draws at
|
|
// the correct zoom level.
|
|
double origin_zoom_level =
|
|
zoom_map->GetZoomLevelForHostAndScheme(url.scheme(), host);
|
|
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
|
origin_zoom_level);
|
|
} else {
|
|
// The host will need a level prior to removing the temporary level.
|
|
// We don't want the zoom level to change just because we entered
|
|
// default mode.
|
|
zoom_map->SetZoomLevelForHost(host, original_zoom_level);
|
|
}
|
|
}
|
|
// Remove per-tab zoom data for this tab. No event callback expected.
|
|
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
|
|
break;
|
|
}
|
|
case ZoomMode::kIsolated: {
|
|
// Unless the zoom mode was |ZoomMode::kDisabled| before this call, the
|
|
// page needs an initial isolated zoom back to the same level it was at
|
|
// in the other mode.
|
|
if (zoom_mode_ != ZoomMode::kDisabled) {
|
|
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
|
original_zoom_level);
|
|
} else {
|
|
// When we don't call any HostZoomMap set functions, we send the event
|
|
// manually.
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
|
|
false);
|
|
}
|
|
break;
|
|
}
|
|
case ZoomMode::kManual: {
|
|
// Unless the zoom mode was |ZoomMode::kDisabled| before this call, the
|
|
// page needs to be resized to the default zoom. While in manual mode,
|
|
// the zoom level is handled independently.
|
|
if (zoom_mode_ != ZoomMode::kDisabled) {
|
|
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
|
GetDefaultZoomLevel());
|
|
zoom_level_ = original_zoom_level;
|
|
} else {
|
|
// When we don't call any HostZoomMap set functions, we send the event
|
|
// manually.
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
|
|
false);
|
|
}
|
|
break;
|
|
}
|
|
case ZoomMode::kDisabled: {
|
|
// The page needs to be zoomed back to default before disabling the zoom
|
|
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
|
GetDefaultZoomLevel());
|
|
break;
|
|
}
|
|
}
|
|
|
|
zoom_mode_ = new_mode;
|
|
}
|
|
|
|
void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
|
|
const GURL& url) {
|
|
if (zoom_mode_ != ZoomMode::kIsolated && zoom_mode_ != ZoomMode::kManual)
|
|
return;
|
|
|
|
int render_process_id =
|
|
web_contents()->GetRenderViewHost()->GetProcess()->GetID();
|
|
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
|
content::HostZoomMap* zoom_map =
|
|
content::HostZoomMap::GetForWebContents(web_contents());
|
|
zoom_level_ = zoom_map->GetDefaultZoomLevel();
|
|
double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme(
|
|
url.scheme(), net::GetHostOrSpecFromURL(url));
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomLevelChanged(web_contents(), new_zoom_level, false);
|
|
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
|
|
zoom_mode_ = ZoomMode::kDefault;
|
|
}
|
|
|
|
void WebContentsZoomController::DidFinishNavigation(
|
|
content::NavigationHandle* navigation_handle) {
|
|
if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
|
|
return;
|
|
|
|
if (navigation_handle->IsErrorPage()) {
|
|
content::HostZoomMap::SendErrorPageZoomLevelRefresh(web_contents());
|
|
return;
|
|
}
|
|
|
|
ResetZoomModeOnNavigationIfNeeded(navigation_handle->GetURL());
|
|
SetZoomFactorOnNavigationIfNeeded(navigation_handle->GetURL());
|
|
}
|
|
|
|
void WebContentsZoomController::WebContentsDestroyed() {
|
|
for (Observer& observer : observers_)
|
|
observer.OnZoomControllerWebContentsDestroyed();
|
|
|
|
observers_.Clear();
|
|
embedder_zoom_controller_ = nullptr;
|
|
}
|
|
|
|
void WebContentsZoomController::RenderFrameHostChanged(
|
|
content::RenderFrameHost* old_host,
|
|
content::RenderFrameHost* new_host) {
|
|
// If our associated HostZoomMap changes, update our event subscription.
|
|
content::HostZoomMap* new_host_zoom_map =
|
|
content::HostZoomMap::GetForWebContents(web_contents());
|
|
if (new_host_zoom_map == host_zoom_map_)
|
|
return;
|
|
|
|
host_zoom_map_ = new_host_zoom_map;
|
|
}
|
|
|
|
void WebContentsZoomController::SetZoomFactorOnNavigationIfNeeded(
|
|
const GURL& url) {
|
|
if (blink::PageZoomValuesEqual(GetDefaultZoomFactor(), kPageZoomEpsilon))
|
|
return;
|
|
|
|
if (host_zoom_map_->UsesTemporaryZoomLevel(old_process_id_, old_view_id_)) {
|
|
host_zoom_map_->ClearTemporaryZoomLevel(old_process_id_, old_view_id_);
|
|
}
|
|
|
|
if (embedder_zoom_controller_ &&
|
|
embedder_zoom_controller_->UsesTemporaryZoomLevel()) {
|
|
double level = embedder_zoom_controller_->GetZoomLevel();
|
|
SetTemporaryZoomLevel(level);
|
|
return;
|
|
}
|
|
|
|
// When kZoomFactor is available, it takes precedence over
|
|
// pref store values but if the host has zoom factor set explicitly
|
|
// then it takes precedence.
|
|
// pref store < kZoomFactor < setZoomLevel
|
|
std::string host = net::GetHostOrSpecFromURL(url);
|
|
std::string scheme = url.scheme();
|
|
double zoom_factor = GetDefaultZoomFactor();
|
|
double zoom_level = blink::PageZoomFactorToZoomLevel(zoom_factor);
|
|
if (host_zoom_map_->HasZoomLevel(scheme, host)) {
|
|
zoom_level = host_zoom_map_->GetZoomLevelForHostAndScheme(scheme, host);
|
|
}
|
|
if (blink::PageZoomValuesEqual(zoom_level, GetZoomLevel()))
|
|
return;
|
|
|
|
SetZoomLevel(zoom_level);
|
|
}
|
|
|
|
WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsZoomController);
|
|
|
|
} // namespace electron
|