mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove CR_DEFINE_STATIC_LOCAL

Browse source 
https://bugs.chromium.org/p/chromium/issues/detail?id=893317
This commit is contained in:
deepak1556 2019-01-10 21:58:15 +05:30 • committed by Jeremy Apthorp
parent 06a5ade3c6
commit 5f941c5180
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
atom/browser/api/atom_api_web_contents.cc
View file

@ -47,6 +47,7 @@
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/no_destructor.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
@ -421,15 +422,14 @@ void WebContents::InitWithSessionAndOptions(
#if defined(OS_LINUX) || defined(OS_WIN) #if defined(OS_LINUX) || defined(OS_WIN)
// Update font settings. // Update font settings.
CR_DEFINE_STATIC_LOCAL( static const base::NoDestructor<gfx::FontRenderParams> params(
const gfx::FontRenderParams, params, gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
(gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr))); prefs->should_antialias_text = params->antialiasing;
prefs->should_antialias_text = params.antialiasing; prefs->use_subpixel_positioning = params->subpixel_positioning;
prefs->use_subpixel_positioning = params.subpixel_positioning; prefs->hinting = params->hinting;
prefs->hinting = params.hinting; prefs->use_autohinter = params->autohinter;
prefs->use_autohinter = params.autohinter; prefs->use_bitmaps = params->use_bitmaps;
prefs->use_bitmaps = params.use_bitmaps; prefs->subpixel_rendering = params->subpixel_rendering;
prefs->subpixel_rendering = params.subpixel_rendering;
#endif #endif
// Save the preferences in C++. // Save the preferences in C++.