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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2307083003: Send the ICC profile to the compositor under aura. (Closed)
Patch Set: merged 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/aura/window_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 643824fec22648fe1d31573619fa07816cc7bb0d..128cb435d4233060e5b16e2b84a7f476a476be81 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -169,7 +169,6 @@ struct GpuProcessTransportFactory::PerCompositorData {
ReflectorImpl* reflector = nullptr;
std::unique_ptr<cc::Display> display;
bool output_is_secure = false;
- gfx::ColorSpace color_space;
};
GpuProcessTransportFactory::GpuProcessTransportFactory()
@@ -566,7 +565,6 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
shared_worker_context_provider_));
data->display->Resize(compositor->size());
data->display->SetOutputIsSecure(data->output_is_secure);
- data->display->SetColorSpace(data->color_space);
compositor->SetOutputSurface(std::move(delegated_output_surface));
}
@@ -690,9 +688,10 @@ void GpuProcessTransportFactory::SetDisplayColorSpace(
return;
PerCompositorData* data = it->second.get();
DCHECK(data);
- data->color_space = color_space;
+ // The compositor will always SetColorSpace on the Display once it is set up,
+ // so do nothing if |display| is null.
if (data->display)
- data->display->SetColorSpace(data->color_space);
+ data->display->SetColorSpace(color_space);
}
void GpuProcessTransportFactory::SetAuthoritativeVSyncInterval(
« no previous file with comments | « no previous file | ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698