ui/gfx/icc_profile.cc - Issue 2950183002: color: Use ICCProfile from display::Display instead of FromBestMonitor

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/gfx/icc_profile.cc

Issue 2950183002: color: Use ICCProfile from display::Display instead of FromBestMonitor (Closed)

Patch Set: Use forced color profile in display::Display ctor Created 3 years, 6 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:

Index: ui/gfx/icc_profile.cc

diff --git a/ui/gfx/icc_profile.cc b/ui/gfx/icc_profile.cc

index a8d643d3bf903863c0f076f3cfe4134f8ef393ee..c57eb526f5655e06643be70f398ed1d293ccea46 100644

--- a/ui/gfx/icc_profile.cc

+++ b/ui/gfx/icc_profile.cc

@@ -104,7 +104,8 @@ ICCProfile ICCProfile::FromDataWithId(const void* data,

return icc_profile;

}

-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_X11)

+#if (!defined(OS_WIN) && !defined(USE_X11) && !defined(OS_MACOSX)) || \

+ defined(OS_IOS)

// static

ICCProfile ICCProfile::FromBestMonitor() {

if (HasForcedProfile())

« no previous file with comments | « ui/gfx/icc_profile.h ('k') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('j') | no next file with comments »