Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2972)

Unified Diff: content/renderer/render_widget.cc

Issue 2954793002: color: Replace more instances of ICCProfile with ColorSpace (Closed)
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ed2476d7dab878d97a497c571d17a60e08d01746..0519a5a031b62e770653806cf7d82718353dcc6a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1219,7 +1219,7 @@ void RenderWidget::Resize(const ResizeParams& params) {
compositor_->SetViewportSize(params.physical_backing_size);
compositor_->setBottomControlsHeight(params.bottom_controls_height);
compositor_->SetRasterColorSpace(
- screen_info_.icc_profile.GetParametricColorSpace());
+ screen_info_.color_space.GetParametricApproximation());
// If surface synchronization is enable, then this will use the provided
// |local_surface_id_| to submit the next generated CompositorFrame.
// If the ID is not valid, then the compositor will defer commits until
@@ -1317,7 +1317,7 @@ blink::WebLayerTreeView* RenderWidget::InitializeLayerTreeView() {
compositor_->SetViewportSize(physical_backing_size_);
OnDeviceScaleFactorChanged();
compositor_->SetRasterColorSpace(
- screen_info_.icc_profile.GetParametricColorSpace());
+ screen_info_.color_space.GetParametricApproximation());
compositor_->SetContentSourceId(current_content_source_id_);
compositor_->SetLocalSurfaceId(local_surface_id_);
// For background pages and certain tests, we don't want to trigger
@@ -2168,7 +2168,7 @@ bool RenderWidget::CanComposeInline() {
blink::WebScreenInfo RenderWidget::GetScreenInfo() {
blink::WebScreenInfo web_screen_info;
web_screen_info.device_scale_factor = screen_info_.device_scale_factor;
- web_screen_info.icc_profile = screen_info_.icc_profile;
+ web_screen_info.color_space = screen_info_.color_space;
web_screen_info.depth = screen_info_.depth;
web_screen_info.depth_per_component = screen_info_.depth_per_component;
web_screen_info.is_monochrome = screen_info_.is_monochrome;
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/platform/graphics/ColorSpaceGamut.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698