90af7d7fe2
* chore: bump chromium in DEPS to 110.0.5461.0 * chore: update patches * 3903024: hid: Add connection count tracking methods for HidDelegate https://chromium-review.googlesource.com/c/chromium/src/+/3903024 * 4076211: Turn FrameTreeNode::frame_tree into raw_ref. https://chromium-review.googlesource.com/c/chromium/src/+/4076211 * chore: bump chromium in DEPS to 110.0.5463.0 * chore: bump chromium in DEPS to 110.0.5465.0 * fix patches * 3835037: Add new slides media session actions to Picture-in-Picture window https://chromium-review.googlesource.com/c/chromium/src/+/3835037 * chore: update patches * chore: bump chromium in DEPS to 110.0.5467.0 * chore: update patches * chore: bump chromium in DEPS to 110.0.5469.0 * chore: bump chromium in DEPS to 110.0.5471.0 * chore: bump chromium in DEPS to 110.0.5473.0 * chore: bump chromium in DEPS to 110.0.5475.0 * chore: update patches * 4074449: Add gl::FrameData to software path https://chromium-review.googlesource.com/c/chromium/src/+/4074449 * 4065264: [Extensions] Add a new side panel view type https://chromium-review.googlesource.com/c/chromium/src/+/4065264 * 4060548: Remove base::Value::GetListDeprecated(). https://chromium-review.googlesource.com/c/chromium/src/+/4060548 * chore: add missing RefCountedMemory include * 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc} https://chromium-review.googlesource.com/c/chromium/src/+/4081108 * 4072471: Rename Mixed Download Blocking to Insecure Download Blocking https://chromium-review.googlesource.com/c/chromium/src/+/4072471 * 4025927: [Code Health] Migrate e/c/manifest.cc to base::Value::Dict interface https://chromium-review.googlesource.com/c/chromium/src/+/4025927 * chore: fixup patch indices * chore: bump chromium in DEPS to 110.0.5477.0 * chore: fixup preconnect_manager.patch * chore: fixup patch indices * fixup! 4074449: Add gl::FrameData to software path * 4074449: Add gl::FrameData to software path This commit also reformatted the two files in this patch. The only change here is the addition of the |data| arg to |OnSwapBuffers|. https://chromium-review.googlesource.com/c/chromium/src/+/4074449 * 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc} https://chromium-review.googlesource.com/c/chromium/src/+/4081108 * 4085814: [Test Automation] Move NativeWindowTracker to ui/views https://chromium-review.googlesource.com/c/chromium/src/+/4085814 * 4032656: hid: Abstract HidSystemTrayIcon class for profiles' HID connections https://chromium-review.googlesource.com/c/chromium/src/+/4032656 * chore: bump chromium in DEPS to 110.0.5479.0 * chore: fixup patches & simplify printing patch To be specific, I replaced some combination of line removals & commenting-out with `#if 0` blocks since they were already there for android. Should be functionally the same, just written differently for better patch maintainability. * chore: bump chromium in DEPS to 110.0.5481.0 * chore: update patch indicies * 4098946: Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) https://chromium-review.googlesource.com/c/chromium/src/+/4098946 * chore: bump chromium in DEPS to 111.0.5482.0 * chore: bump chromium in DEPS to 111.0.5484.0 * chore: bump chromium in DEPS to 111.0.5486.0 * chore: update patch indices * 4112903: Reland "Move gl::FrameData to gfx::FrameData" https://chromium-review.googlesource.com/c/chromium/src/+/4112903 * 4056216: Option to create a tab target with Target.createTarget in /json/new https://chromium-review.googlesource.com/c/chromium/src/+/4056216 * chore: bump chromium in DEPS to 111.0.5488.0 * chore: bump chromium in DEPS to 111.0.5490.0 * chore: bump chromium in DEPS to 111.0.5492.0 * chore: bump chromium in DEPS to 111.0.5494.0 * chore: bump chromium in DEPS to 111.0.5496.0 * chore: bump chromium in DEPS to 111.0.5498.0 * chore: bump chromium in DEPS to 111.0.5500.0 * chore: bump chromium in DEPS to 111.0.5502.0 * chore: update patch indices + small update to printing.patch due to: 3653941: [printing] Extract settings logic from PrintJobWorker https://chromium-review.googlesource.com/c/chromium/src/+/3653941 * 4113994: Cleanup: Rename webui_generated_resources_* to webui_resources_*. https://chromium-review.googlesource.com/c/chromium/src/+/4113994 * 4112537: Remove DictionaryPrefUpdate. https://chromium-review.googlesource.com/c/chromium/src/+/4112537 * 4072073: Remove //chrome/browser/ash dependency from pdf_extension_util.cc https://chromium-review.googlesource.com/c/chromium/src/+/4072073 * 4055223: [Remove FileSystemConnector] Remove DownloadItemRerouteInfo https://chromium-review.googlesource.com/c/chromium/src/+/4055223 * Migrate base::DictionaryValue to base::Value::Dict This relates to multiple CLs cleaning up this class in this roll, but the ones that are specifically relevant here: 4116096: [CodeHealth] Remove DictionaryValue::GetInteger https://chromium-review.googlesource.com/c/chromium/src/+/4116096 4113764: [CodeHealth] Remove deprecated DictionaryValue::SetInteger() https://chromium-review.googlesource.com/c/chromium/src/+/4113764 * 3653941: [printing] Extract settings logic from PrintJobWorker https://chromium-review.googlesource.com/c/chromium/src/+/3653941 * chore: bump chromium in DEPS to 111.0.5504.0 * chore: update patches * (WIP) 4003663: Enable Microtask queues per WindowAgent. https://chromium-review.googlesource.com/c/chromium/src/+/4003663 * chore: bump chromium in DEPS to 111.0.5506.0 * chore: update patches * fix: printing patch It was complaining that this method isn't used on windows * chore: bump chromium in DEPS to 111.0.5508.0 * chore: bump chromium in DEPS to 111.0.5510.0 * chore: bump chromium in DEPS to 111.0.5512.0 * chore: bump chromium in DEPS to 111.0.5514.0 * chore: bump chromium in DEPS to 111.0.5516.0 * chore: update patches * chore: bump chromium in DEPS to 111.0.5518.0 * chore: update patches * 4027428: [rsafor] Move rsaFor requests to a separate permission https://chromium-review.googlesource.com/c/chromium/src/+/4027428 * Revert "(WIP) 4003663: Enable Microtask queues per WindowAgent." This reverts commit cc36d226e3f3fe5f4bea6538102d55ce3203190f. * chore: disable Microtask queues per WindowAgent. see https://chromium-review.googlesource.com/c/chromium/src/+/4003663 * chore: cleanup after rebase * fixup: disable Microtask queues per WindowAgent. * chore: cleanup password from keychain after test 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: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Calvin Watford <cwatford@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org>
160 lines
6 KiB
C++
160 lines
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 <utility>
|
|
#include <vector>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/string_number_conversions.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;
|
|
|
|
ScopedDictPrefUpdate update(pref_service_, kPartitionDefaultZoomLevel);
|
|
update->Set(partition_key_, level);
|
|
host_zoom_map_->SetDefaultZoomLevel(level);
|
|
}
|
|
|
|
double ZoomLevelDelegate::GetDefaultZoomLevelPref() const {
|
|
const base::Value::Dict& default_zoom_level_dictionary =
|
|
pref_service_->GetDict(kPartitionDefaultZoomLevel);
|
|
// If no default has been previously set, the default returned is the
|
|
// value used to initialize default_zoom_level in this function.
|
|
return default_zoom_level_dictionary.FindDouble(partition_key_).value_or(0.0);
|
|
}
|
|
|
|
void ZoomLevelDelegate::OnZoomLevelChanged(
|
|
const content::HostZoomMap::ZoomLevelChange& change) {
|
|
if (change.mode != content::HostZoomMap::ZOOM_CHANGED_FOR_HOST)
|
|
return;
|
|
|
|
double level = change.zoom_level;
|
|
ScopedDictPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
|
|
base::Value::Dict& host_zoom_dictionaries = update.Get();
|
|
|
|
bool modification_is_removal =
|
|
blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
|
|
|
|
base::Value::Dict* host_zoom_dictionary =
|
|
host_zoom_dictionaries.FindDict(partition_key_);
|
|
if (!host_zoom_dictionary) {
|
|
base::Value::Dict dict;
|
|
host_zoom_dictionaries.Set(partition_key_, std::move(dict));
|
|
host_zoom_dictionary = host_zoom_dictionaries.FindDict(partition_key_);
|
|
}
|
|
|
|
if (modification_is_removal)
|
|
host_zoom_dictionary->Remove(change.host);
|
|
else
|
|
host_zoom_dictionary->Set(change.host, base::Value(level));
|
|
}
|
|
|
|
void ZoomLevelDelegate::ExtractPerHostZoomLevels(
|
|
const base::Value::Dict& host_zoom_dictionary) {
|
|
std::vector<std::string> keys_to_remove;
|
|
base::Value::Dict host_zoom_dictionary_copy = host_zoom_dictionary.Clone();
|
|
for (auto [host, value] : host_zoom_dictionary_copy) {
|
|
const absl::optional<double> zoom_level = 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.has_value() ||
|
|
blink::PageZoomValuesEqual(zoom_level.value(),
|
|
host_zoom_map_->GetDefaultZoomLevel())) {
|
|
keys_to_remove.push_back(host);
|
|
continue;
|
|
}
|
|
|
|
host_zoom_map_->SetZoomLevelForHost(host, zoom_level.value());
|
|
}
|
|
|
|
// Sanitize prefs to remove entries that match the default zoom level and/or
|
|
// have an empty host.
|
|
{
|
|
ScopedDictPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
|
|
base::Value* sanitized_host_zoom_dictionary = update->Find(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::Dict& host_zoom_dictionaries =
|
|
pref_service_->GetDict(kPartitionPerHostZoomLevels);
|
|
const base::Value::Dict* host_zoom_dictionary =
|
|
host_zoom_dictionaries.FindDict(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(*host_zoom_dictionary);
|
|
}
|
|
zoom_subscription_ =
|
|
host_zoom_map_->AddZoomLevelChangedCallback(base::BindRepeating(
|
|
&ZoomLevelDelegate::OnZoomLevelChanged, base::Unretained(this)));
|
|
}
|
|
|
|
} // namespace electron
|