![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 99.0.4819.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4824.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4827.0 * chore: update patches * 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed3309164
* 3297868: hid: Add experimental HIDDevice.forget()3297868
* 3362491: [Extensions] Move i18n API to //extensions3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.3281481
* 3352616: [Gtk] Remove libgtk from the link-line3352616
* 3249211: Clear-Site-Data support for partitioned cookies3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method3354997
* 3287323: Add LacrosPrefStore for lacros settings3287323
* 3365916: [PA] Clean up remaining lazy commit code3365916
* [MPArch] Target the external protocol error at the responsible frame.3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories3350608
* Linux: Send OSCrypt raw encryption key to the Network Service3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.3359441
* chore: fixup for lint * 3327621: Fix tablet mode detection for Win 11.3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella3342428
* 3353974: Mac: Use base::Feature for overlay features3353974
* chore: bump chromium in DEPS to 99.0.4828.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4837.0 * chore: update patches * chore: update patches * 3379142: Drop FALLTHROUGH macro Ref:3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign Ref:3381749
* chore: bump chromium in DEPS to 99.0.4839.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4840.0 * chore: bump chromium in DEPS to 99.0.4844.0 * 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext() Ref:3395881
* chore: update patches * chore: bump chromium in DEPS to 100.0.4845.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4847.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4849.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4851.0 * chore: bump chromium in DEPS to 100.0.4853.0 * update patches * chore: update patches * update patches * 3383599: Fonts Access: Remove prototype that uses a font picker.3383599
* 3404768: Remove ALLOW_UNUSED macros3404768
* 3374762: Remove ignore_result.h3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x113378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.3370810
* chore: bump chromium in DEPS to 100.0.4855.0 * chore: update patches * fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process. * revert 3348007 to fix windows build * 3318572: [Code health] Fix gn check errors in //extensions/browser:*3318572
* fix printing.patch * fix iwyu issue * 3408515: win: Make ShorcutOperation an enum class and modernize names3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc3388333
* fix windows build? i hope * patch gn visibility of //ui/ozone/platform/x11 * missing include base/logging.h * use BUILDFLAG for USE_NSS_CERTS3379123
* defined(OS_*) ==> BUILDFLAG(IS_*) https://bugs.chromium.org/p/chromium/issues/detail?id=1234043 * fixup! 3404768: Remove ALLOW_UNUSED macros * another attempt to fix windows build * temporarily disable the custom scheme service worker test https://github.com/electron/electron/issues/32664 * fix loading mv3 extensions not sure what cl broke this unfort. * fixup! 3404768: Remove ALLOW_UNUSED macros * patch nan3395880
* fix node test * fix nullptr in FindPdfFrame * patch perfetto to fix build issue on win-ia32bc44c3c753
* fix build for linux-x64-testing-no-run-as-node * fix patch * skip <webview>.capturePage() test https://github.com/electron/electron/issues/32705 * test: fix failing tests of focus/blur events of WebContents (#32711) * inherit stdio from app module test child processes this prevents them from timing out due to full stdout buffers * test to see if we can get better logs on windows ci * try again for appveyor log things * skip contentTracing tests on ia32 * ci: disable gpu compositing * drop applied patch * fix merge fail * Revert "ci: disable gpu compositing" This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Cheng Zhao <zcbenz@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
174 lines
6.5 KiB
C++
174 lines
6.5 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->SetDoubleKey(partition_key_, level);
|
|
host_zoom_map_->SetDefaultZoomLevel(level);
|
|
}
|
|
|
|
double ZoomLevelDelegate::GetDefaultZoomLevelPref() const {
|
|
double default_zoom_level = 0.0;
|
|
|
|
const base::Value* 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::Value* host_zoom_dictionaries = update.Get();
|
|
DCHECK(host_zoom_dictionaries);
|
|
|
|
bool modification_is_removal =
|
|
blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
|
|
|
|
base::Value* host_zoom_dictionary =
|
|
host_zoom_dictionaries->FindDictKey(partition_key_);
|
|
if (!host_zoom_dictionary) {
|
|
host_zoom_dictionaries->SetKey(partition_key_,
|
|
base::Value(base::Value::Type::DICTIONARY));
|
|
host_zoom_dictionary = host_zoom_dictionaries->FindDictKey(partition_key_);
|
|
}
|
|
|
|
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::Value* host_zoom_dictionaries = update.Get();
|
|
base::Value* sanitized_host_zoom_dictionary =
|
|
host_zoom_dictionaries->FindDictKey(partition_key_);
|
|
if (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::Value* host_zoom_dictionaries =
|
|
pref_service_->GetDictionary(kPartitionPerHostZoomLevels);
|
|
const base::Value* host_zoom_dictionary =
|
|
host_zoom_dictionaries->FindDictKey(partition_key_);
|
|
if (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::SExtractPerHostZoomLevelsetZoomLevelForHost().
|
|
ExtractPerHostZoomLevels(
|
|
&base::Value::AsDictionaryValue(*host_zoom_dictionary));
|
|
}
|
|
zoom_subscription_ =
|
|
host_zoom_map_->AddZoomLevelChangedCallback(base::BindRepeating(
|
|
&ZoomLevelDelegate::OnZoomLevelChanged, base::Unretained(this)));
|
|
}
|
|
|
|
} // namespace electron
|