| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/display/display_color_manager_chromeos.h" | 5 #include "ash/display/display_color_manager_chromeos.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/task_runner_util.h" | 12 #include "base/task_runner_util.h" |
| 13 #include "base/threading/sequenced_worker_pool.h" | 13 #include "base/threading/sequenced_worker_pool.h" |
| 14 #include "components/quirks/quirks_manager.h" | 14 #include "components/quirks/quirks_manager.h" |
| 15 #include "third_party/qcms/src/qcms.h" | 15 #include "third_party/qcms/src/qcms.h" |
| 16 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
| 17 #include "ui/display/types/display_constants.h" |
| 17 #include "ui/display/types/display_snapshot.h" | 18 #include "ui/display/types/display_snapshot.h" |
| 18 #include "ui/display/types/gamma_ramp_rgb_entry.h" | 19 #include "ui/display/types/gamma_ramp_rgb_entry.h" |
| 19 | 20 |
| 20 namespace ash { | 21 namespace ash { |
| 21 | 22 |
| 22 namespace { | 23 namespace { |
| 23 | 24 |
| 24 std::unique_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile( | 25 std::unique_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile( |
| 25 const base::FilePath& path, | 26 const base::FilePath& path, |
| 26 bool has_color_correction_matrix) { | 27 bool has_color_correction_matrix) { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 if (!configurator_->SetColorCorrection(display_id, data->degamma_lut, | 184 if (!configurator_->SetColorCorrection(display_id, data->degamma_lut, |
| 184 data->gamma_lut, | 185 data->gamma_lut, |
| 185 data->correction_matrix)) | 186 data->correction_matrix)) |
| 186 LOG(WARNING) << "Error applying color correction data"; | 187 LOG(WARNING) << "Error applying color correction data"; |
| 187 } | 188 } |
| 188 } | 189 } |
| 189 | 190 |
| 190 void DisplayColorManager::LoadCalibrationForDisplay( | 191 void DisplayColorManager::LoadCalibrationForDisplay( |
| 191 const ui::DisplaySnapshot* display) { | 192 const ui::DisplaySnapshot* display) { |
| 192 DCHECK(thread_checker_.CalledOnValidThread()); | 193 DCHECK(thread_checker_.CalledOnValidThread()); |
| 193 if (display->display_id() == display::Display::kInvalidDisplayID) { | 194 if (display->display_id() == display::kInvalidDisplayId) { |
| 194 LOG(WARNING) << "Trying to load calibration data for invalid display id"; | 195 LOG(WARNING) << "Trying to load calibration data for invalid display id"; |
| 195 return; | 196 return; |
| 196 } | 197 } |
| 197 | 198 |
| 198 quirks::QuirksManager::Get()->RequestIccProfilePath( | 199 quirks::QuirksManager::Get()->RequestIccProfilePath( |
| 199 display->product_id(), | 200 display->product_id(), |
| 200 base::Bind(&DisplayColorManager::FinishLoadCalibrationForDisplay, | 201 base::Bind(&DisplayColorManager::FinishLoadCalibrationForDisplay, |
| 201 weak_ptr_factory_.GetWeakPtr(), display->display_id(), | 202 weak_ptr_factory_.GetWeakPtr(), display->display_id(), |
| 202 display->product_id(), display->has_color_correction_matrix(), | 203 display->product_id(), display->has_color_correction_matrix(), |
| 203 display->type())); | 204 display->type())); |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 calibration_map_[product_id] = std::move(data); | 246 calibration_map_[product_id] = std::move(data); |
| 246 ApplyDisplayColorCalibration(display_id, product_id); | 247 ApplyDisplayColorCalibration(display_id, product_id); |
| 247 } | 248 } |
| 248 } | 249 } |
| 249 | 250 |
| 250 DisplayColorManager::ColorCalibrationData::ColorCalibrationData() {} | 251 DisplayColorManager::ColorCalibrationData::ColorCalibrationData() {} |
| 251 | 252 |
| 252 DisplayColorManager::ColorCalibrationData::~ColorCalibrationData() {} | 253 DisplayColorManager::ColorCalibrationData::~ColorCalibrationData() {} |
| 253 | 254 |
| 254 } // namespace ash | 255 } // namespace ash |
| OLD | NEW |