content/renderer/renderer_main_platform_delegate_win.cc - Issue 644813004: Move the ShouldUseDirectWrite function from sandbox_win.cc/.h to ui/gfx/win/dpi.cc/.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/renderer_main_platform_delegate_win.cc

Issue 644813004: Move the ShouldUseDirectWrite function from sandbox_win.cc/.h to ui/gfx/win/dpi.cc/.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review comments from sky Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/shell/renderer/layout_test/layout_test_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/renderer_main_platform_delegate_win.cc

diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc

index 086823ab87e8930b2816a924c8b5591a267d8662..952d00d3df7011c41b9cb40f76e651b00e7de26d 100644

--- a/content/renderer/renderer_main_platform_delegate_win.cc

+++ b/content/renderer/renderer_main_platform_delegate_win.cc

@@ -11,7 +11,6 @@

#include "base/win/scoped_comptr.h"

#include "base/win/win_util.h"

#include "base/win/windows_version.h"

-#include "content/common/sandbox_win.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/injection_test_win.h"

#include "content/public/renderer/render_font_warmup_win.h"

@@ -25,6 +24,7 @@

#include "third_party/icu/source/i18n/unicode/timezone.h"

#include "third_party/skia/include/ports/SkFontMgr.h"

#include "third_party/skia/include/ports/SkTypeface_win.h"

+#include "ui/gfx/win/direct_write.h"

#include "ui/gfx/win/dpi.h"

#ifdef ENABLE_VTUNE_JIT_INTERFACE

@@ -88,7 +88,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {

// malicious code if the renderer gets compromised.

bool no_sandbox = command_line.HasSwitch(switches::kNoSandbox);

- bool use_direct_write = ShouldUseDirectWrite();

+ bool use_direct_write = gfx::win::ShouldUseDirectWrite();

if (!no_sandbox) {

// ICU DateFormat class (used in base/time_format.cc) needs to get the

// Olson timezone ID by accessing the registry keys under