mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 110.0.5461.0
* chore: bump chromium in DEPS to 110.0.5463.0
* chore: bump chromium in DEPS to 110.0.5465.0
* chore: bump chromium in DEPS to 110.0.5467.0
* 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: bump chromium in DEPS to 110.0.5477.0
* chore: bump chromium in DEPS to 110.0.5479.0
* chore: bump chromium in DEPS to 110.0.5481.0
* chore: bump chromium in DEPS to 110.0.5481.4
* chore: bump chromium in DEPS to 110.0.5478.5
* chore: update patches
* 4074449: Add gl::FrameData to software path
https://chromium-review.googlesource.com/c/chromium/src/+/4074449
(cherry picked from commit 1f61be81384b3e22b8af8f9221a7e5ef9a4d95cb)
* fixup! 4074449: Add gl::FrameData to software path
(cherry picked from commit 2316ec931ec9cb1d4ade43df2f3663ef155c5a61)
* 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
(cherry picked from commit aa2504ee6b4e3a2eaf3348eb535ef8121dd6cc3b)
* 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc}
https://chromium-review.googlesource.com/c/chromium/src/+/4081108
(cherry picked from commit fce317513ee15138351f8b1bdf062250d97f57b9)
* 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc}
https://chromium-review.googlesource.com/c/chromium/src/+/4081108
(cherry picked from commit cb14d9f5df300020a3b8d11078656763b428789e)
* chore: add missing RefCountedMemory include
(cherry picked from commit 893a1da1ed5a461e0e46abecab2a2de545ab543b)
* 4025927: [Code Health] Migrate e/c/manifest.cc to base::Value::Dict interface
https://chromium-review.googlesource.com/c/chromium/src/+/4025927
(cherry picked from commit f9e1ce44bdbe1c199881daef2799164737e2d39d)
* 4072471: Rename Mixed Download Blocking to Insecure Download Blocking
https://chromium-review.googlesource.com/c/chromium/src/+/4072471
(cherry picked from commit e191d7526d3821ace54717ce7c8a5e95df542135)
* 4060548: Remove base::Value::GetListDeprecated().
https://chromium-review.googlesource.com/c/chromium/src/+/4060548
(cherry picked from commit f76cb2bcb4d1772c596c7e8dc5be27024e2b9cfe)
* 4032656: hid: Abstract HidSystemTrayIcon class for profiles' HID connections
https://chromium-review.googlesource.com/c/chromium/src/+/4032656
(cherry picked from commit 9737692d016d726f277c7a6ac6ec919b18820cba)
* 3903024: hid: Add connection count tracking methods for HidDelegate
https://chromium-review.googlesource.com/c/chromium/src/+/3903024
(cherry picked from commit a0299046cd3cedb1c84b4ecf867089fce9304861)
* 4076211: Turn FrameTreeNode::frame_tree into raw_ref.
https://chromium-review.googlesource.com/c/chromium/src/+/4076211
(cherry picked from commit 6cca422b421013ce166779cc9687d50301ac3280)
* 4112537: Remove DictionaryPrefUpdate.
https://chromium-review.googlesource.com/c/chromium/src/+/4112537
(cherry picked from commit ec8e8f75deed5da760c75267c5575509923ae7e4)
* 3835037: Add new slides media session actions to Picture-in-Picture window
https://chromium-review.googlesource.com/c/chromium/src/+/3835037
(cherry picked from commit 7dc35729bce450b365b8d211536a275e8e3f0a08)
* 4065264: [Extensions] Add a new side panel view type
https://chromium-review.googlesource.com/c/chromium/src/+/4065264
(cherry picked from commit c6c3c3ff8289c87a6ca831ff23100b3dde74eddf)
* 4085814: [Test Automation] Move NativeWindowTracker to ui/views
https://chromium-review.googlesource.com/c/chromium/src/+/4085814
(cherry picked from commit ffbe5437139752f507bef4c66cc958e6dcef3bce)
* chore: disable Microtask queues per WindowAgent.
see https://chromium-review.googlesource.com/c/chromium/src/+/4003663
(cherry picked from commit 0ffa9df410a27236ed73b07d5b36c84783b0f9d1)
* fixup: disable Microtask queues per WindowAgent.
(cherry picked from commit 438be771dd)
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: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Calvin Watford <cwatford@slack-corp.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
161 lines
6.0 KiB
C++
161 lines
6.0 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
|