3da598015b
* chore: bump chromium in DEPS to 100.0.4880.0 * resolve conflicts * chore: update patches * fix patch * PIP20: add a new DocumentOverlayWindowViews subtype https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * Clean up PictureInPictureWindowManager::EnterPictureInPicture() https://chromium-review.googlesource.com/c/chromium/src/+/3424145 * Remove StoragePartitionId. https://chromium-review.googlesource.com/c/chromium/src/+/2811120 * Remove FLoC code https://chromium-review.googlesource.com/c/chromium/src/+/3424359 * media: Make AddSupportedKeySystems() Async https://chromium-review.googlesource.com/c/chromium/src/+/3430502 * [Extensions] Move some l10n file util methods to //extensions/browser https://chromium-review.googlesource.com/c/chromium/src/+/3408192 * chore: IWYU * Reland "webhid: Grant permissions for policy-allowed devices" https://chromium-review.googlesource.com/c/chromium/src/+/3444147 * Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N. https://chromium-review.googlesource.com/c/chromium/src/+/3435727 https://chromium-review.googlesource.com/c/chromium/src/+/3440910 https://chromium-review.googlesource.com/c/chromium/src/+/3440088 * [text blink period] Cache blink period instead of fetching from defaults https://chromium-review.googlesource.com/c/chromium/src/+/3419059 * chore: update picture-in-picture.patch https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * ci: update to Xcode 13.2.1 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4882.1 * chore: update patches * chore: bump chromium in DEPS to 100.0.4884.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4886.0 * chore: update patches * Refactor DownloadManager to use StoragePartitionConfig https://chromium-review.googlesource.com/c/chromium/src/+/3222011 * Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers. https://chromium-review.googlesource.com/c/chromium/src/+/3433852 * refactor: autofill to use the color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 https://bugs.chromium.org/p/chromium/issues/detail?id=1003612 * [ProcessSingleton] Add many more trace events to cover all scenarios https://chromium-review.googlesource.com/c/chromium/src/+/3429325 * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * chore: bump chromium in DEPS to 100.0.4888.0 * chore: update patches * chore: update picture-in-picture.patch * fixup! refactor: autofill to use the color pipeline * ci: fixup fix sync (cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd) * chore: bump chromium in DEPS to 100.0.4889.0 * chore: update patches * chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * Remove remaining NativeTheme::GetSystemColor() machinery. https://chromium-review.googlesource.com/c/chromium/src/+/3421719 * ci: fetch proper esbuild for macos * ci: fixup fetch proper esbuild for macos * fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion * chore: bump chromium in DEPS to 100.0.4892.0 * 3460365: Set V8 fatal error callbacks during Isolate initialization https://chromium-review.googlesource.com/c/chromium/src/+/3460365 * 3454343: PIP20: use permanent top controls https://chromium-review.googlesource.com/c/chromium/src/+/3454343 * 3465574: Move most of GTK color mixers to ui/color/. https://chromium-review.googlesource.com/c/chromium/src/+/3465574 * chore: fixup patch indices * 3445327: [locales] Remove locales reference https://chromium-review.googlesource.com/c/chromium/src/+/3445327 * 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels https://chromium-review.googlesource.com/c/chromium/src/+/3456548 * 3441196: Convert GuestView's remaining legacy IPC messages to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/3441196 * 3455491: Don't include run_loop.h in thread_task_runner_handle.h https://chromium-review.googlesource.com/c/chromium/src/+/3455491 * fixup! 3454343: PIP20: use permanent top controls * 3442501: Add missing includes of //base/observer_list.h https://chromium-review.googlesource.com/c/chromium/src/+/3442501 * 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4894.0 * fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization * chore: update patches * 3425231: Use DnsOverHttpsConfig where appropriate https://chromium-review.googlesource.com/c/chromium/src/+/3425231 * test: disable test-heapsnapshot-near-heap-limit-worker.js As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503, heap snapshotting near the heap limit DCHECKS in Node.js specs. This will likely require a larger refactor in Node.js so i've disabled the test for now and opened an upstream issue on node-v8 issue at https://github.com/nodejs/node-v8/issues/218. * Port all usage of NativeTheme color IDs to color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 * chore: update patches after rebase * ci: use gen2 machine for more disk space * ci: don't try to make root volume writeable * ci: use older xcode/macos for tests * fix: html fullscreen transitions stacking (cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44) * ci: speed up woa testing (cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de) (cherry picked from commit e81996234029669663bf0daaababd34684dcbb17) * ci: disable flaky tests on WOA * ci: run remote tests separately to isolate issue there * tests: disable node test parallel/test-worker-debug for now * revert: fix: html fullscreen transitions stacking * tests: disable flaky test on macOS arm64 * fixup circleci config so build tools can find xcode version * make sure the workspace is clean before job runs (cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6) * tests: disable flaky test on Linux * ci: debug why windows i32 is crashing * Revert "ci: debug why windows i32 is crashing" This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
125 lines
4.2 KiB
C++
125 lines
4.2 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.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
|
|
#define ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
|
|
|
|
#include "base/observer_list.h"
|
|
#include "base/observer_list_types.h"
|
|
#include "content/public/browser/host_zoom_map.h"
|
|
#include "content/public/browser/web_contents_observer.h"
|
|
#include "content/public/browser/web_contents_user_data.h"
|
|
|
|
namespace electron {
|
|
|
|
// Manages the zoom changes of WebContents.
|
|
class WebContentsZoomController
|
|
: public content::WebContentsObserver,
|
|
public content::WebContentsUserData<WebContentsZoomController> {
|
|
public:
|
|
class Observer : public base::CheckedObserver {
|
|
public:
|
|
virtual void OnZoomLevelChanged(content::WebContents* web_contents,
|
|
double level,
|
|
bool is_temporary) {}
|
|
virtual void OnZoomControllerWebContentsDestroyed() {}
|
|
|
|
protected:
|
|
~Observer() override {}
|
|
};
|
|
|
|
// Defines how zoom changes are handled.
|
|
enum class ZoomMode {
|
|
// Results in default zoom behavior, i.e. zoom changes are handled
|
|
// automatically and on a per-origin basis, meaning that other tabs
|
|
// navigated to the same origin will also zoom.
|
|
kDefault,
|
|
// Results in zoom changes being handled automatically, but on a per-tab
|
|
// basis. Tabs in this zoom mode will not be affected by zoom changes in
|
|
// other tabs, and vice versa.
|
|
kIsolated,
|
|
// Overrides the automatic handling of zoom changes. The |onZoomChange|
|
|
// event will still be dispatched, but the page will not actually be zoomed.
|
|
// These zoom changes can be handled manually by listening for the
|
|
// |onZoomChange| event. Zooming in this mode is also on a per-tab basis.
|
|
kManual,
|
|
// Disables all zooming in this tab. The tab will revert to the default
|
|
// zoom level, and all attempted zoom changes will be ignored.
|
|
kDisabled,
|
|
};
|
|
|
|
explicit WebContentsZoomController(content::WebContents* web_contents);
|
|
~WebContentsZoomController() override;
|
|
|
|
// disable copy
|
|
WebContentsZoomController(const WebContentsZoomController&) = delete;
|
|
WebContentsZoomController& operator=(const WebContentsZoomController&) =
|
|
delete;
|
|
|
|
void AddObserver(Observer* observer);
|
|
void RemoveObserver(Observer* observer);
|
|
|
|
void SetEmbedderZoomController(WebContentsZoomController* controller);
|
|
|
|
// Methods for managing zoom levels.
|
|
void SetZoomLevel(double level);
|
|
double GetZoomLevel();
|
|
void SetDefaultZoomFactor(double factor);
|
|
double GetDefaultZoomFactor();
|
|
void SetTemporaryZoomLevel(double level);
|
|
bool UsesTemporaryZoomLevel();
|
|
|
|
// Sets the zoom mode, which defines zoom behavior (see enum ZoomMode).
|
|
void SetZoomMode(ZoomMode zoom_mode);
|
|
|
|
void ResetZoomModeOnNavigationIfNeeded(const GURL& url);
|
|
|
|
ZoomMode zoom_mode() const { return zoom_mode_; }
|
|
|
|
// Convenience method to get default zoom level. Implemented here for
|
|
// inlining.
|
|
double GetDefaultZoomLevel() const {
|
|
return content::HostZoomMap::GetForWebContents(web_contents())
|
|
->GetDefaultZoomLevel();
|
|
}
|
|
|
|
protected:
|
|
// content::WebContentsObserver:
|
|
void DidFinishNavigation(content::NavigationHandle* handle) override;
|
|
void WebContentsDestroyed() override;
|
|
void RenderFrameHostChanged(content::RenderFrameHost* old_host,
|
|
content::RenderFrameHost* new_host) override;
|
|
|
|
private:
|
|
friend class content::WebContentsUserData<WebContentsZoomController>;
|
|
|
|
// Called after a navigation has committed to set default zoom factor.
|
|
void SetZoomFactorOnNavigationIfNeeded(const GURL& url);
|
|
|
|
// The current zoom mode.
|
|
ZoomMode zoom_mode_ = ZoomMode::kDefault;
|
|
|
|
// Current zoom level.
|
|
double zoom_level_ = 1.0;
|
|
|
|
// kZoomFactor.
|
|
double default_zoom_factor_ = 0;
|
|
|
|
const double kPageZoomEpsilon = 0.001;
|
|
|
|
int old_process_id_ = -1;
|
|
int old_view_id_ = -1;
|
|
|
|
WebContentsZoomController* embedder_zoom_controller_ = nullptr;
|
|
|
|
base::ObserverList<Observer> observers_;
|
|
|
|
content::HostZoomMap* host_zoom_map_;
|
|
|
|
WEB_CONTENTS_USER_DATA_KEY_DECL();
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
|