ui/gl/gl_surface_win.cc - Issue 817653003: Update from https://crrev.com/309717

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: ui/gl/gl_surface_win.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years ago

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

Jump to:

Index: ui/gl/gl_surface_win.cc

diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc

index 5cf68afac762b24aa7af01059aa4470bd57e086e..0e10bacc05ee723714c1579ac7161c976d1af406 100644

--- a/ui/gl/gl_surface_win.cc

+++ b/ui/gl/gl_surface_win.cc

@@ -353,8 +353,9 @@ scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(

}

EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {

- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) ||

- CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseWarp))

+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kDisableD3D11) ||

+ base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseWarp))

return GetDC(NULL);

return EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;

}

« no previous file with comments | « ui/gl/gl_surface_egl.cc ('k') | ui/gl/gpu_switching_manager.cc » ('j') | no next file with comments »