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

Unified Diff: cc/surfaces/surface_aggregator.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surface_aggregator.h ('k') | content/browser/renderer_host/browser_compositor_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index a17440557d38cdee838ec0c3d3218fc3454b6a03..012779976ee889c147613ba436c1442cc7652490 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -938,8 +938,12 @@ void SurfaceAggregator::SetFullDamageForSurface(const SurfaceId& surface_id) {
void SurfaceAggregator::SetOutputColorSpace(
const gfx::ColorSpace& blending_color_space,
const gfx::ColorSpace& output_color_space) {
- blending_color_space_ = blending_color_space;
- output_color_space_ = output_color_space;
+ blending_color_space_ = blending_color_space.IsValid()
+ ? blending_color_space
+ : gfx::ColorSpace::CreateSRGB();
+ output_color_space_ = output_color_space.IsValid()
+ ? output_color_space
+ : gfx::ColorSpace::CreateSRGB();
}
} // namespace cc
« no previous file with comments | « cc/surfaces/surface_aggregator.h ('k') | content/browser/renderer_host/browser_compositor_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698