61374019c0
* chore: bump chromium in DEPS to 103.0.5020.0 * chore: bump chromium in DEPS to 103.0.5022.0 * chore: bump chromium in DEPS to 103.0.5024.0 * chore: update patches * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 * chore: bump chromium in DEPS to 103.0.5026.0 * chore: update patches * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 * chore: bump chromium in DEPS to 103.0.5028.0 * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 * chore: fix authorization flags lint error * 3583363: Remove net wrappers around base/strings/escape.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * fixup! 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589 * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 * 3596174: [api] Remove APIs for resurrecting finalizers Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: bump chromium in DEPS to 103.0.5030.0 * chore: update patches * chore: bump chromium in DEPS to 103.0.5032.0 * chore: bump chromium in DEPS to 103.0.5034.0 * chore: bump chromium in DEPS to 103.0.5036.0 * chore: update patches * 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363 * 3593199: Remove content::PermissionType references and replace them with blink::PermissionType Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: lint * chore: bump chromium in DEPS to 103.0.5038.0 * chore: update patches * fixup! 3560622: serial: Add SerialPort.forget() method * 3606495: mac screen capture: add metric Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495 * chore: bump chromium in DEPS to 103.0.5040.0 * chore: update patches * 3590840: Add IPs to DnsOverHttpsServerConfig https://chromium-review.googlesource.com/c/chromium/src/+/3590840 * stub functions for ElectronSerialDelegate and SerialChooserController to fix link * 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h! Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944 * fixup! 3566412: [base] Remove base/android dependency on post_task.h and off… e3ea3e1 …icially remove post_task.h! * chore: update process_singleton patches for content::GetIOThreadTaskRunner({}) Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655 * chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo * chore: migrate Linux/Windows methods off of post_task.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * chore: bump chromium in DEPS to 103.0.5042.0 * chore: update patches * 3571804: [api] Advance API deprecation for V8 version v10.2 https://chromium-review.googlesource.com/c/v8/v8/+/3571804 * fixup! 3571804: [api] Advance API deprecation for V8 version v10.2 * build: fix run-clang-format extension matching * lint * fix windows build * how is clang-format still not working for me * chore: update patches * 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient. https://chromium-review.googlesource.com/c/chromium/src/+/3623985 * no need to implement WillProvidePublicFirstPartySets; the default is false * 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.* https://chromium-review.googlesource.com/c/chromium/src/+/3601036 * 3583363: Remove net wrappers around base/strings/escape.h https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * lint * chore: bump chromium in DEPS to 103.0.5044.0 * fix conflicts * chore: update patches * upgrade nan * pin version of nan in tests * replace my hacky deprecated override fix with the fix from upstream * revert runtime dcheck in v8 * pin nan version at root too * refactor: tell gyp to use c++17 when building with our node * Revert "refactor: tell gyp to use c++17 when building with our node" This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192. * Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192. This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348. * disable sequential/test-cpu-prof-kill for now * also sequential/test-diagnostic-dir-cpu-prof Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.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()->GetMainFrame()->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
|