28ada6ea8b
* 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 buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* 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: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/v8/v8/+/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.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/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:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* 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 nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* 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>
177 lines
7.1 KiB
C++
177 lines
7.1 KiB
C++
// Copyright (c) 2018 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/font_defaults.h"
|
|
|
|
#include <string>
|
|
#include <unordered_map>
|
|
|
|
#include "base/stl_util.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "chrome/common/pref_names.h"
|
|
#include "chrome/grit/platform_locale_settings.h"
|
|
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
namespace {
|
|
|
|
// The following list of font defaults was copied from
|
|
// https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/chrome/browser/ui/prefs/prefs_tab_helper.cc#152
|
|
//
|
|
// The only updates that should be made to this list are copying updates that
|
|
// were made in Chromium.
|
|
//
|
|
// vvvvv DO NOT EDIT vvvvv
|
|
|
|
struct FontDefault {
|
|
const char* pref_name;
|
|
int resource_id;
|
|
};
|
|
|
|
// Font pref defaults. The prefs that have defaults vary by platform, since not
|
|
// all platforms have fonts for all scripts for all generic families.
|
|
// TODO(falken): add proper defaults when possible for all
|
|
// platforms/scripts/generic families.
|
|
const FontDefault kFontDefaults[] = {
|
|
{prefs::kWebKitStandardFontFamily, IDS_STANDARD_FONT_FAMILY},
|
|
{prefs::kWebKitFixedFontFamily, IDS_FIXED_FONT_FAMILY},
|
|
{prefs::kWebKitSerifFontFamily, IDS_SERIF_FONT_FAMILY},
|
|
{prefs::kWebKitSansSerifFontFamily, IDS_SANS_SERIF_FONT_FAMILY},
|
|
{prefs::kWebKitCursiveFontFamily, IDS_CURSIVE_FONT_FAMILY},
|
|
{prefs::kWebKitFantasyFontFamily, IDS_FANTASY_FONT_FAMILY},
|
|
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
|
{prefs::kWebKitStandardFontFamilyJapanese,
|
|
IDS_STANDARD_FONT_FAMILY_JAPANESE},
|
|
{prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE},
|
|
{prefs::kWebKitSerifFontFamilyJapanese, IDS_SERIF_FONT_FAMILY_JAPANESE},
|
|
{prefs::kWebKitSansSerifFontFamilyJapanese,
|
|
IDS_SANS_SERIF_FONT_FAMILY_JAPANESE},
|
|
{prefs::kWebKitStandardFontFamilyKorean, IDS_STANDARD_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitSerifFontFamilyKorean, IDS_SERIF_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitSansSerifFontFamilyKorean,
|
|
IDS_SANS_SERIF_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitStandardFontFamilySimplifiedHan,
|
|
IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitSerifFontFamilySimplifiedHan,
|
|
IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitSansSerifFontFamilySimplifiedHan,
|
|
IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitStandardFontFamilyTraditionalHan,
|
|
IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN},
|
|
{prefs::kWebKitSerifFontFamilyTraditionalHan,
|
|
IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN},
|
|
{prefs::kWebKitSansSerifFontFamilyTraditionalHan,
|
|
IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN},
|
|
#endif
|
|
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
|
{prefs::kWebKitCursiveFontFamilySimplifiedHan,
|
|
IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitCursiveFontFamilyTraditionalHan,
|
|
IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN},
|
|
#endif
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
|
{prefs::kWebKitStandardFontFamilyArabic, IDS_STANDARD_FONT_FAMILY_ARABIC},
|
|
{prefs::kWebKitSerifFontFamilyArabic, IDS_SERIF_FONT_FAMILY_ARABIC},
|
|
{prefs::kWebKitSansSerifFontFamilyArabic,
|
|
IDS_SANS_SERIF_FONT_FAMILY_ARABIC},
|
|
{prefs::kWebKitFixedFontFamilyKorean, IDS_FIXED_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitFixedFontFamilySimplifiedHan,
|
|
IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitFixedFontFamilyTraditionalHan,
|
|
IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN},
|
|
#elif BUILDFLAG(IS_WIN)
|
|
{prefs::kWebKitFixedFontFamilyArabic, IDS_FIXED_FONT_FAMILY_ARABIC},
|
|
{prefs::kWebKitSansSerifFontFamilyArabic,
|
|
IDS_SANS_SERIF_FONT_FAMILY_ARABIC},
|
|
{prefs::kWebKitStandardFontFamilyCyrillic,
|
|
IDS_STANDARD_FONT_FAMILY_CYRILLIC},
|
|
{prefs::kWebKitFixedFontFamilyCyrillic, IDS_FIXED_FONT_FAMILY_CYRILLIC},
|
|
{prefs::kWebKitSerifFontFamilyCyrillic, IDS_SERIF_FONT_FAMILY_CYRILLIC},
|
|
{prefs::kWebKitSansSerifFontFamilyCyrillic,
|
|
IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC},
|
|
{prefs::kWebKitStandardFontFamilyGreek, IDS_STANDARD_FONT_FAMILY_GREEK},
|
|
{prefs::kWebKitFixedFontFamilyGreek, IDS_FIXED_FONT_FAMILY_GREEK},
|
|
{prefs::kWebKitSerifFontFamilyGreek, IDS_SERIF_FONT_FAMILY_GREEK},
|
|
{prefs::kWebKitSansSerifFontFamilyGreek, IDS_SANS_SERIF_FONT_FAMILY_GREEK},
|
|
{prefs::kWebKitFixedFontFamilyKorean, IDS_FIXED_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitCursiveFontFamilyKorean, IDS_CURSIVE_FONT_FAMILY_KOREAN},
|
|
{prefs::kWebKitFixedFontFamilySimplifiedHan,
|
|
IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN},
|
|
{prefs::kWebKitFixedFontFamilyTraditionalHan,
|
|
IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN},
|
|
#endif
|
|
};
|
|
const size_t kFontDefaultsLength = base::size(kFontDefaults);
|
|
|
|
// ^^^^^ DO NOT EDIT ^^^^^
|
|
|
|
std::string GetDefaultFontForPref(const char* pref_name) {
|
|
for (size_t i = 0; i < kFontDefaultsLength; ++i) {
|
|
FontDefault pref = kFontDefaults[i];
|
|
if (strcmp(pref.pref_name, pref_name) == 0) {
|
|
return l10n_util::GetStringUTF8(pref.resource_id);
|
|
}
|
|
}
|
|
return std::string();
|
|
}
|
|
|
|
// Map from script to font.
|
|
// Key comparison uses pointer equality.
|
|
using ScriptFontMap = std::unordered_map<const char*, std::u16string>;
|
|
|
|
// Map from font family to ScriptFontMap.
|
|
// Key comparison uses pointer equality.
|
|
using FontFamilyMap = std::unordered_map<const char*, ScriptFontMap>;
|
|
|
|
// A lookup table mapping (font-family, script) -> font-name
|
|
// e.g. ("sans-serif", "Zyyy") -> "Arial"
|
|
FontFamilyMap g_font_cache;
|
|
|
|
std::u16string FetchFont(const char* script, const char* map_name) {
|
|
FontFamilyMap::const_iterator it = g_font_cache.find(map_name);
|
|
if (it != g_font_cache.end()) {
|
|
ScriptFontMap::const_iterator it2 = it->second.find(script);
|
|
if (it2 != it->second.end())
|
|
return it2->second;
|
|
}
|
|
|
|
std::string pref_name = base::StringPrintf("%s.%s", map_name, script);
|
|
std::string font = GetDefaultFontForPref(pref_name.c_str());
|
|
std::u16string font16 = base::UTF8ToUTF16(font);
|
|
|
|
ScriptFontMap& map = g_font_cache[map_name];
|
|
map[script] = font16;
|
|
return font16;
|
|
}
|
|
|
|
void FillFontFamilyMap(const char* map_name,
|
|
blink::web_pref::ScriptFontFamilyMap* map) {
|
|
for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
|
|
const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
|
|
std::u16string result = FetchFont(script, map_name);
|
|
if (!result.empty()) {
|
|
(*map)[script] = result;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
void SetFontDefaults(blink::web_pref::WebPreferences* prefs) {
|
|
FillFontFamilyMap(prefs::kWebKitStandardFontFamilyMap,
|
|
&prefs->standard_font_family_map);
|
|
FillFontFamilyMap(prefs::kWebKitFixedFontFamilyMap,
|
|
&prefs->fixed_font_family_map);
|
|
FillFontFamilyMap(prefs::kWebKitSerifFontFamilyMap,
|
|
&prefs->serif_font_family_map);
|
|
FillFontFamilyMap(prefs::kWebKitSansSerifFontFamilyMap,
|
|
&prefs->sans_serif_font_family_map);
|
|
FillFontFamilyMap(prefs::kWebKitCursiveFontFamilyMap,
|
|
&prefs->cursive_font_family_map);
|
|
}
|
|
|
|
} // namespace electron
|