mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 94.0.4595.0 * chore: bump chromium in DEPS to 94.0.4596.0 * chore: bump chromium in DEPS to 94.0.4597.0 * chore: bump chromium in DEPS to 94.0.4598.2 * chore: bump chromium in DEPS to 94.0.4599.2 * chore: bump chromium in DEPS to 94.0.4600.0 * chore: bump chromium in DEPS to 94.0.4601.0 * chore: bump chromium in DEPS to 94.0.4602.0 * chore: bump chromium in DEPS to 94.0.4603.0 * chore: bump chromium in DEPS to 94.0.4604.0 * chore: bump chromium in DEPS to 94.0.4603.0 * chore: bump chromium in DEPS to 94.0.4605.0 * chore: bump chromium in DEPS to 94.0.4606.0 * chore: bump chromium in DEPS to 94.0.4606.3 * chore: bump chromium in DEPS to 94.0.4606.5 * build: 3-way merge of chromium patches (cherry picked from commit d77d456a369c07dbc06e4c2eade23e4029a4c169) * build: 3-way merge of chromium patches (cherry picked from commit e495584d5c8a36a469946ada24fa75b30776e1b9) * 3076040: Reland Remove delete_children RemoveAllChildViews arg Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3076040 (cherry picked from commit 22e131c7b5e146ac57b813a6906d87f98a51c3c3) * 3069287: Remove the remaining uses and delete the deprecated API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3069287 (cherry picked from commit a6c546107298ab197893e1bdef906b15bb4f1c70) * 2297212: Replace RemoveWithoutPathExpansion(.*, nullptr) with Value::RemoveKey() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2297212 Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (cherry picked from commit 10854b7cb26b1cd259b067e3f5aa2b266bf8eb9a) * 3082756: Change transport_security_persister_path param to be a path to a file. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3082756 > this CL intentionally changes the name of the parameter > in the network context parameters and the order of the constructor > parameters to ensure all callers update their code to pass a full > file path rather than a path to a directory. The 'path' in this diff is already an absolute path, coming from `CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));` at08ff1c2cbf/shell/browser/electron_browser_context.cc (L126)(cherry picked from commit 3e310964ffc592b0a0af4eeededeab3cadbec5a5) * iwyu: network::mojom::HttpRawHeaderPair (cherry picked from commit 51c73ea7fd65711eaf26f545b39b8e4a52435182) * fixup! 3076040: Reland Remove delete_children RemoveAllChildViews arg Missed one. (cherry picked from commit f6f9de30780e6b1c677dc55f081af34e4f44fd9c) * 2999884: CodeHealth: Remove DictionaryValue::GetStringWithoutPathExpansion Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2999884 (example of replacing GetStringWithoutPathExpansion() w/FindStringKey()) Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (removal of DictionaryValue::GetStringWithoutPathExpansion) (cherry picked from commit 5f7fd94d71480e05ad8badf4be1cfc5d2bd685ce) * 3059260: Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3059260 We had both of these in a 'disable_features' list. Since these feature have been removed upstream, remove them from our disable list, too. IMPORTANT: this commit should not be backported to older branches that still have these features, because doing so would un-disable them. (cherry picked from commit a09154d0b20af4680d7c7be6cafd40f84408df2e) * 2920890: Load reroute_info from download in-progress and history db back into DownloadItem. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2920890 (cherry picked from commit 66a3797a3f798a368c7630d6c6a1ebc3d8606880) * 3039323: [Clipboard API] Clipboard Custom Formats implementation Part 5. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3039323 (cherry picked from commit 136b2ed9aa601bd59b3416d11c1109d249850faa) * 3084502: Add a new PrintRasterizePdfDpi policy. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3084502 (cherry picked from commit effbe639741a0ae7929691b1ec174aa61bdfd921) * chore: update patches (cherry picked from commit 4b03542e425f73ef7742ee272f30feac350d9bd0) * chore: update patches * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 (cherry picked from commit 4b308cb8c37b8d84bce8f037d11c242ce9d45845) * [DevTools] Remove report_raw_headers from network::ResourceRequest (Attempt #2) https://chromium-review.googlesource.com/c/chromium/src/+/2856099 (cherry picked from commit 5e72ee04519bfbcc524ad198175f5d28006f55c8) * Add a new PrintRasterizePdfDpi policy. https://chromium-review.googlesource.com/c/chromium/src/+/3084502 (cherry picked from commit fe24bdc76233fc9b64fa3ba6619d8a44c464120c) * chore: update patches * chore: fix lint (cherry picked from commit ed0d9adef6b9c5fb8c2b4bcf6783a3bd58605d51) * Linux: use chrome_crashpad_handler instead of crashpad_handler https://chromium-review.googlesource.com/c/chromium/src/+/3054290 (cherry picked from commit 0c63c9c1312422180c85bedac5ba8cfb6418649f) * DCHECK that predictor always has a non-empty NetworkIsolationKey. https://chromium-review.googlesource.com/c/chromium/src/+/3067698 (cherry picked from commit ce135b12534ca03ce3dc2aa0a9e0ddcfc4627aa6) * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure https://chromium-review.googlesource.com/c/chromium/src/+/3059260 (cherry picked from commit db85c394ba40c3fde42f6b09bc9b01105dbe4d76) * chore: bump chromium in DEPS to 94.0.4606.12 * chore: update patches * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 (cherry picked from commit205e477037) * Convert PrintManager to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3072019 (cherry picked from commit6bf73bce81) * [Clipboard API] Clipboard Custom Formats implementation Part 5. https://chromium-review.googlesource.com/c/chromium/src/+/3039323 (cherry picked from commitffd697df93) * Convert ExtensionFrameHost to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3063358 (cherry picked from commit5e50771835) * cleanup after merge * chore: fix lint (cherry picked from commitb4ea757281) * chore: disable v8 oilpan (cherry picked from commit19a5afd264) * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure (cherry picked from commitd0a1a8b51a) * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure (cherry picked from commitc49b5a9277) * fixup! Disable kDesktopCaptureMacV2 (cherry picked from commitbc6b974647) 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: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
168 lines
6.5 KiB
C++
168 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->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.
|
|
default_zoom_level_dictionary->GetDouble(partition_key_, &default_zoom_level);
|
|
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
|