diff options
Diffstat (limited to 'chromium/ui/compositor/compositor.cc')
| -rw-r--r-- | chromium/ui/compositor/compositor.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chromium/ui/compositor/compositor.cc b/chromium/ui/compositor/compositor.cc index 178fc2628e3..65d2f3ec773 100644 --- a/chromium/ui/compositor/compositor.cc +++ b/chromium/ui/compositor/compositor.cc @@ -450,16 +450,6 @@ void Compositor::SetDisplayColorSpaces( if (display_color_spaces_ == display_color_spaces) return; display_color_spaces_ = display_color_spaces; - // TODO(crbug.com/1012846): Remove this flag and provision when HDR is fully - // supported on ChromeOS. -#if defined(OS_CHROMEOS) - if (display_color_spaces_.SupportsHDR() && - !base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableUseHDRTransferFunction)) { - display_color_spaces_ = - gfx::DisplayColorSpaces(gfx::ColorSpace::CreateSRGB()); - } -#endif host_->SetRasterColorSpace(display_color_spaces_.GetRasterColorSpace()); // Always force the ui::Compositor to re-draw all layers, because damage @@ -615,7 +605,8 @@ void Compositor::IssueExternalBeginFrame( } ThroughputTracker Compositor::RequestNewThroughputTracker() { - return ThroughputTracker(next_throughput_tracker_id_++, this); + return ThroughputTracker(next_throughput_tracker_id_++, + weak_ptr_factory_.GetWeakPtr()); } void Compositor::DidUpdateLayers() { |