content/renderer/render_view_impl.cc - Issue 2226733003: Color: Clean up color profile handling for layout tests

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/render_view_impl.cc

Issue 2226733003: Color: Clean up color profile handling for layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master2

Patch Set: Fix windows Created 4 years, 4 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/renderer/content_renderer_client.cc ('k') | content/shell/renderer/layout_test/layout_test_content_renderer_client.h » ('j') | content/shell/renderer/layout_test/layout_test_content_renderer_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_impl.cc

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

index 48ae4541de43d3642a33f5251101a42c19c58fc0..aaf02fa149a24eee51e18465063bd3c5316a697d 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -720,7 +720,13 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,

command_line.HasSwitch(switches::kRootLayerScrolls));

webview()->setShowFPSCounter(

command_line.HasSwitch(cc::switches::kShowFPSCounter));

- webview()->setDeviceColorProfile(params.image_decode_color_space.GetData());

+ if (auto overridden_color_profile =

+ GetContentClient()->renderer()->GetImageDecodeColorProfile()) {

+ webview()->setDeviceColorProfile(overridden_color_profile->GetData());

+ } else {

+ webview()->setDeviceColorProfile(params.image_decode_color_space.GetData());

+ }

ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);