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

Unified Diff: cc/resources/resource_provider.cc

Issue 2351823002: cc: Add conversion between gfx::ColorSpace and SkColorSpace (Closed)
Patch Set: Add warnings Created 4 years, 3 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 | « no previous file | ui/gfx/color_space.h » ('j') | ui/gfx/color_space.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index b189fcb62cf76411b4a3c9639d0eda91eb115980..68c2de685e27a7e5c3db4c60239bc717a31eacee 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -825,9 +825,9 @@ ResourceProvider::TextureHint ResourceProvider::GetTextureHint(ResourceId id) {
sk_sp<SkColorSpace> ResourceProvider::GetResourceSkColorSpace(
const Resource* resource) const {
- // TODO(crbug.com/634102): Implement conversion for skia-based compositing to
- // be color-managed
- return nullptr;
+ if (!enable_color_correct_rendering_)
+ return nullptr;
+ return resource->color_space.ToSkColorSpace();
}
void ResourceProvider::CopyToResource(ResourceId id,
« no previous file with comments | « no previous file | ui/gfx/color_space.h » ('j') | ui/gfx/color_space.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698