mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 97.0.4678.0
* chore: bump chromium in DEPS to 97.0.4679.0
* chore: bump chromium in DEPS to 97.0.4680.0
* chore: bump chromium in DEPS to 97.0.4681.0
* chore: bump chromium in DEPS to 97.0.4682.0
* chore: update patches
* 3234737: Disable -Wunused-but-set-variable
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* 3216953: Reland "Move task-related files from base/ to base/task/"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216953
* 3202710: TimeDelta factory function migration.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3202710
* 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3226841
* 3212165: blink/gin: changes blink to load snapshot based on runtime information
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3212165
* 3220292: Deprecate returning a GURL from GURL::GetOrigin()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3220292
* 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3231995
* 3205121: Remove base::DictionaryValue::GetDouble
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3205121
* 3208413: [flags] Make --js-flags settings have priority over V8 features
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3208413
* chore: bump chromium in DEPS to 97.0.4683.0
* chore: update patches
* 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3188834
* chore: update process_singleton patches
* chore: bump chromium in DEPS to 97.0.4684.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4685.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4686.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4687.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4688.0
* chore: update patches
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3223422
sync pepper_plugin_support.patch with upstream
* chore: bump chromium in DEPS to 97.0.4689.0
* 3247791: ax_mac_merge: Merge AX Math attribute implementations
Xref: ax_mac_merge: Merge AX Math attribute implementations
chore: fix minor patch shear in #includes
* 3243425: Add VisibleTimeRequestTrigger helper class
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3243425
chore: fix minor patch shear in #includes
* chore: regen chromium patches
* fixup! 3247722: Use correct source_site_instance if navigating via context menu
* chore: bump chromium in DEPS to 97.0.4690.0
* 3188659: Window Placement: make GetScreenInfo(s) const
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3188659
simple sync GetScreenInfo with upstream refactor
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4690.4
* chore: bump chromium in DEPS to 97.0.4692.0
* 3198073: ozone: //content: clean up from USE_X11
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3198073
Fixing patch shear. Nothing to see here.
* 3252338: Remove label images checkbox from chrome://accessibility page
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3252338
Part of our a11y patch is no longer needed due to upstream label removal
* 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3258183
Replace our use of the macro with explicitly-deleted class methods.
See https://chromium-review.googlesource.com/c/chromium/src/+/3256952
for upstream examples of this same replacement.
* chore: update patches
* 3247295: Unwind SecurityStyleExplanations
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3247295
update GetSecurityStyle() signature and impl to match upstream changes
* 3259578: media: grabs lock to ensure video output when occluded
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3259578
Add stub for new upstream virtual method OnCapturerCountChanged()
* fixup! 3247295: Unwind SecurityStyleExplanations
* 3238504: Fix up drag image is not shown from bookmark bar
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3238504
SetDragImage() no longer takes a widget argument
* 3217452: [devtools] Add getSyncInformation host binding
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3217452
Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled.
* chore: bump chromium in DEPS to 98.0.4693.0
* chore: bump chromium in DEPS to 98.0.4694.0
* chore: bump chromium in DEPS to 98.0.4695.0
* chore: bump chromium in DEPS to 98.0.4696.0
* chore: bump chromium in DEPS to 98.0.4697.0
* chore: bump chromium in DEPS to 98.0.4699.0
* chore: bump chromium in DEPS to 98.0.4701.0
* chore: bump chromium in DEPS to 98.0.4703.0
* chore: bump chromium in DEPS to 98.0.4705.0
* chore: bump chromium in DEPS to 98.0.4706.0
* chore: update patches
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs
https://chromium-review.googlesource.com/c/chromium/src/+/3259964
* 3269029: blink/gin: sets histogram callbacks during isolate creation
https://chromium-review.googlesource.com/c/chromium/src/+/3269029
* fixup after rebase
* [content] Make ContentMainParams and MainFunctionParams move-only
https://chromium-review.googlesource.com/c/chromium/src/+/3244976
* 3255305: Stop sending the securityStateChanged event and unwind
https://chromium-review.googlesource.com/c/chromium/src/+/3255305
* [Blink] Add promise support to WebLocalFrame::RequestExecuteScript()
https://chromium-review.googlesource.com/c/chromium/src/+/3230010
* 3256162: Simplify RWHV Show and ShowWithVisibility handling
https://chromium-review.googlesource.com/c/chromium/src/+/3256162
* 3263824: ozone: //ui/base: clean up from USE_X11 1/*
https://chromium-review.googlesource.com/c/chromium/src/+/3263824
* Request or cancel RecordContentToPresentationTimeRequest during capture
https://chromium-review.googlesource.com/c/chromium/src/+/3256802
* appcache: remove BrowsingData/quota references
https://chromium-review.googlesource.com/c/chromium/src/+/3255725
* [Autofill] Don't show Autofill dropdown if overlaps with permissions
https://chromium-review.googlesource.com/c/chromium/src/+/3236729
* Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks
https://chromium-review.googlesource.com/c/chromium/src/+/3268574
* cleanup patch
* fixup [content] Make ContentMainParams and MainFunctionParams move-only
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* ozone: //chrome/browser clean up from USE_X11
https://chromium-review.googlesource.com/c/chromium/src/+/3186490
Refs: https://github.com/electron/electron/issues/31382
* chore: update support_mixed_sandbox_with_zygote.patch
* Enable -Wunused-but-set-variable.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* fixup! ozone: //ui/base: clean up from USE_X11 1/*
* fixup! ozone: //chrome/browser clean up from USE_X11
* chore: fix deprecation warning in libuv
* chore: fixup for lint
* 3251161: Reland "Make the Clang update.py script require Python 3"
https://chromium-review.googlesource.com/c/chromium/src/+/3251161
* fixup: Enable -Wunused-but-set-variable.
* [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
https://chromium-review.googlesource.com/c/chromium/src/+/3262369
* Replace sandbox::policy::SandboxType with mojom Sandbox enum
https://chromium-review.googlesource.com/c/chromium/src/+/3213677
* fixup: [content] Make ContentMainParams and MainFunctionParams move-only
* build: ensure angle has a full git checkout available to it
* fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
* fixup lint
* [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame
https://chromium-review.googlesource.com/c/chromium/src/+/3223434
* fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions
* 3217591: Move browser UI CSS color parsing to own file part 2/2
https://chromium-review.googlesource.com/c/chromium/src/+/3217591
* Make kNoSandboxAndElevatedPrivileges only available to utilities
https://chromium-review.googlesource.com/c/chromium/src/+/3276784
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* Address review feedback
* chore: update patches
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* fix: unused variable compat
* chore: remove redundant patch
* fixup for 3262517: Re-enable WindowCaptureMacV2
https://chromium-review.googlesource.com/c/chromium/src/+/3262517
* chore: cleanup todo
The functions added in https://chromium-review.googlesource.com/c/chromium/src/+/3256802 are not used by offscreen rendering.
* fixup: update mas_no_private_api.patch
* 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216879 Fixes up commit b2f1aca956
* chore: cleanup support_mixed_sandbox_with_zygote.patch
* test: use window focus event instead of delay to wait for webContents focus
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
172 lines
6.6 KiB
C++
172 lines
6.6 KiB
C++
// Copyright 2014 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/zoom_level_delegate.h"
|
|
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/values.h"
|
|
#include "components/prefs/json_pref_store.h"
|
|
#include "components/prefs/pref_filter.h"
|
|
#include "components/prefs/pref_registry_simple.h"
|
|
#include "components/prefs/pref_service_factory.h"
|
|
#include "components/prefs/scoped_user_pref_update.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "third_party/blink/public/common/page/page_zoom.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// Double that indicates the default zoom level.
|
|
const char kPartitionDefaultZoomLevel[] = "partition.default_zoom_level";
|
|
|
|
// Dictionary that maps hostnames to zoom levels. Hosts not in this pref will
|
|
// be displayed at the default zoom level.
|
|
const char kPartitionPerHostZoomLevels[] = "partition.per_host_zoom_levels";
|
|
|
|
std::string GetHash(const base::FilePath& partition_path) {
|
|
size_t int_key = std::hash<base::FilePath>()(partition_path);
|
|
return base::NumberToString(int_key);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
void ZoomLevelDelegate::RegisterPrefs(PrefRegistrySimple* registry) {
|
|
registry->RegisterDictionaryPref(kPartitionDefaultZoomLevel);
|
|
registry->RegisterDictionaryPref(kPartitionPerHostZoomLevels);
|
|
}
|
|
|
|
ZoomLevelDelegate::ZoomLevelDelegate(PrefService* pref_service,
|
|
const base::FilePath& partition_path)
|
|
: pref_service_(pref_service) {
|
|
DCHECK(pref_service_);
|
|
partition_key_ = GetHash(partition_path);
|
|
}
|
|
|
|
ZoomLevelDelegate::~ZoomLevelDelegate() = default;
|
|
|
|
void ZoomLevelDelegate::SetDefaultZoomLevelPref(double level) {
|
|
if (blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel()))
|
|
return;
|
|
|
|
DictionaryPrefUpdate update(pref_service_, kPartitionDefaultZoomLevel);
|
|
update->SetDouble(partition_key_, level);
|
|
host_zoom_map_->SetDefaultZoomLevel(level);
|
|
}
|
|
|
|
double ZoomLevelDelegate::GetDefaultZoomLevelPref() const {
|
|
double default_zoom_level = 0.0;
|
|
|
|
const base::DictionaryValue* default_zoom_level_dictionary =
|
|
pref_service_->GetDictionary(kPartitionDefaultZoomLevel);
|
|
// If no default has been previously set, the default returned is the
|
|
// value used to initialize default_zoom_level in this function.
|
|
absl::optional<double> maybe_default_zoom_level =
|
|
default_zoom_level_dictionary->FindDoubleKey(partition_key_);
|
|
if (maybe_default_zoom_level.has_value())
|
|
default_zoom_level = maybe_default_zoom_level.value();
|
|
|
|
return default_zoom_level;
|
|
}
|
|
|
|
void ZoomLevelDelegate::OnZoomLevelChanged(
|
|
const content::HostZoomMap::ZoomLevelChange& change) {
|
|
if (change.mode != content::HostZoomMap::ZOOM_CHANGED_FOR_HOST)
|
|
return;
|
|
|
|
double level = change.zoom_level;
|
|
DictionaryPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
|
|
base::DictionaryValue* host_zoom_dictionaries = update.Get();
|
|
DCHECK(host_zoom_dictionaries);
|
|
|
|
bool modification_is_removal =
|
|
blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
|
|
|
|
base::DictionaryValue* host_zoom_dictionary = nullptr;
|
|
if (!host_zoom_dictionaries->GetDictionary(partition_key_,
|
|
&host_zoom_dictionary)) {
|
|
host_zoom_dictionary = host_zoom_dictionaries->SetDictionary(
|
|
partition_key_, std::make_unique<base::DictionaryValue>());
|
|
}
|
|
|
|
if (modification_is_removal)
|
|
host_zoom_dictionary->RemoveKey(change.host);
|
|
else
|
|
host_zoom_dictionary->SetKey(change.host, base::Value(level));
|
|
}
|
|
|
|
void ZoomLevelDelegate::ExtractPerHostZoomLevels(
|
|
const base::DictionaryValue* host_zoom_dictionary) {
|
|
std::vector<std::string> keys_to_remove;
|
|
std::unique_ptr<base::DictionaryValue> host_zoom_dictionary_copy =
|
|
host_zoom_dictionary->DeepCopyWithoutEmptyChildren();
|
|
for (base::DictionaryValue::Iterator i(*host_zoom_dictionary_copy);
|
|
!i.IsAtEnd(); i.Advance()) {
|
|
const std::string& host(i.key());
|
|
const absl::optional<double> zoom_level = i.value().GetIfDouble();
|
|
|
|
// Filter out A) the empty host, B) zoom levels equal to the default; and
|
|
// remember them, so that we can later erase them from Prefs.
|
|
// Values of type B could further have been stored before the default zoom
|
|
// level was set to its current value. In either case, SetZoomLevelForHost
|
|
// will ignore type B values, thus, to have consistency with HostZoomMap's
|
|
// internal state, these values must also be removed from Prefs.
|
|
if (host.empty() || !zoom_level ||
|
|
blink::PageZoomValuesEqual(*zoom_level,
|
|
host_zoom_map_->GetDefaultZoomLevel())) {
|
|
keys_to_remove.push_back(host);
|
|
continue;
|
|
}
|
|
|
|
host_zoom_map_->SetZoomLevelForHost(host, *zoom_level);
|
|
}
|
|
|
|
// Sanitize prefs to remove entries that match the default zoom level and/or
|
|
// have an empty host.
|
|
{
|
|
DictionaryPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
|
|
base::DictionaryValue* host_zoom_dictionaries = update.Get();
|
|
base::DictionaryValue* sanitized_host_zoom_dictionary = nullptr;
|
|
host_zoom_dictionaries->GetDictionary(partition_key_,
|
|
&sanitized_host_zoom_dictionary);
|
|
for (const std::string& s : keys_to_remove)
|
|
sanitized_host_zoom_dictionary->RemoveKey(s);
|
|
}
|
|
}
|
|
|
|
void ZoomLevelDelegate::InitHostZoomMap(content::HostZoomMap* host_zoom_map) {
|
|
// This init function must be called only once.
|
|
DCHECK(!host_zoom_map_);
|
|
DCHECK(host_zoom_map);
|
|
host_zoom_map_ = host_zoom_map;
|
|
|
|
// Initialize the default zoom level.
|
|
host_zoom_map_->SetDefaultZoomLevel(GetDefaultZoomLevelPref());
|
|
|
|
// Initialize the HostZoomMap with per-host zoom levels from the persisted
|
|
// zoom-level preference values.
|
|
const base::DictionaryValue* host_zoom_dictionaries =
|
|
pref_service_->GetDictionary(kPartitionPerHostZoomLevels);
|
|
const base::DictionaryValue* host_zoom_dictionary = nullptr;
|
|
if (host_zoom_dictionaries->GetDictionary(partition_key_,
|
|
&host_zoom_dictionary)) {
|
|
// Since we're calling this before setting up zoom_subscription_ below we
|
|
// don't need to worry that host_zoom_dictionary is indirectly affected
|
|
// by calls to HostZoomMap::SetZoomLevelForHost().
|
|
ExtractPerHostZoomLevels(host_zoom_dictionary);
|
|
}
|
|
zoom_subscription_ =
|
|
host_zoom_map_->AddZoomLevelChangedCallback(base::BindRepeating(
|
|
&ZoomLevelDelegate::OnZoomLevelChanged, base::Unretained(this)));
|
|
}
|
|
|
|
} // namespace electron
|