Revert of Load and apply a vcgt table from an ICC file to the interna…

…l display (patchset chromium#15 id:300001 of https://codereview.chromium.org/1028563003/) Reason for revert: breaks compilation https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20GN%20(dbg)/builds/1084 Original issue's description: > Load and apply a vcgt table from an ICC file to the internal display > > When the command line switch --internal-display-color-profile-file is provided > load the given ICC file using qcms and extract the VCGT data. Use this VCGT > data to apply a gamma ramp to change the output on the internal display using > drmModeCrtcSetGammaRamp. > > BUG=471749 > TEST=On a link_freon device add the command line option to load a sample ICC > file (e.g. Bluish.icc to give a blue tint) and observe on startup that the > internal display is blue tinted. > > Committed: https://crrev.com/46134a86af1eac76e97b062a68afeaa6c8801216 > Cr-Commit-Position: refs/heads/master@{#328318} TBR=dcheng@chromium.org,dnicoara@chromium.org,noel@chromium.org,oshima@chromium.org,sievers@chromium.org,spang@chromium.org,robert.bradford@intel.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=471749 Review URL: https://codereview.chromium.org/1118373006 Cr-Commit-Position: refs/heads/master@{#328321}
cbchan · May 5, 2015 · e005ecc · e005ecc
1 parent a780ea9
commit e005ecc
Show file tree

Hide file tree

Showing 33 changed files with 0 additions and 410 deletions.
diff --git a/ash/ash.gyp b/ash/ash.gyp
@@ -43,8 +43,6 @@
       'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
       'cancel_mode.h',
-      'content/display/display_color_manager_chromeos.cc',
-      'content/display/display_color_manager_chromeos.h',
       'content/display/screen_orientation_controller_chromeos.cc',
       'content/display/screen_orientation_controller_chromeos.h',
       'debug.cc',
@@ -969,7 +967,6 @@
             # Ash #includes power_supply_properties.pb.h directly.
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../third_party/qcms/qcms.gyp:qcms',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',

diff --git a/ash/content/display/DEPS b/ash/content/display/DEPS
@@ -2,9 +2,7 @@ include_rules = [
   "+content/public/browser/screen_orientation_delegate.h",
   "+content/public/browser/screen_orientation_provider.h",
   "+content/public/browser/browser_context.h",
-  "+content/public/browser/browser_thread.h",
   "+content/public/browser/web_contents.h",
-  "+third_party/qcms/src/qcms.h",
   "+third_party/WebKit/public/platform/WebScreenOrientationLockType.h",
 ]
 

diff --git a/ash/content/display/display_color_manager_chromeos.cc b/ash/content/display/display_color_manager_chromeos.cc
diff --git a/ash/content/display/display_color_manager_chromeos.h b/ash/content/display/display_color_manager_chromeos.h
diff --git a/ash/shell.cc b/ash/shell.cc
@@ -121,7 +121,6 @@
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/ash_constants.h"
-#include "ash/content/display/display_color_manager_chromeos.h"
 #include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_change_observer_chromeos.h"
 #include "ash/display/display_configurator_animation.h"
@@ -812,7 +811,6 @@ Shell::~Shell() {
   keyboard::KeyboardController::ResetInstance(NULL);
 
 #if defined(OS_CHROMEOS)
-  display_color_manager_.reset();
   if (display_change_observer_)
     display_configurator_->RemoveObserver(display_change_observer_.get());
   if (display_configurator_animation_)
@@ -865,8 +863,6 @@ void Shell::Init(const ShellInitParams& init_params) {
         delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
     display_initialized = true;
   }
-  display_color_manager_.reset(
-      new DisplayColorManager(display_configurator_.get()));
 #endif  // defined(OS_CHROMEOS)
   if (!display_initialized)
     display_manager_->InitDefaultDisplay();

diff --git a/ash/shell.h b/ash/shell.h
@@ -83,7 +83,6 @@ class BluetoothNotificationController;
 class CaptureController;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
-class DisplayColorManager;
 class DisplayConfiguratorAnimation;
 class DisplayController;
 class DisplayErrorObserver;
@@ -726,7 +725,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   // Controls video output device state.
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
-  scoped_ptr<DisplayColorManager> display_color_manager_;
   scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -220,10 +220,6 @@ const char kHostPairingOobe[] = "host-pairing-oobe";
 const char kIgnoreUserProfileMappingForTests[] =
     "ignore-user-profile-mapping-for-tests";
 
-// File to load internal display ICC file from.
-const char kInternalDisplayColorProfileFile[] =
-    "internal-display-color-profile-file";
-
 // Enables Chrome-as-a-login-manager behavior.
 const char kLoginManager[] = "login-manager";
 

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -87,7 +87,6 @@ CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[];
 CHROMEOS_EXPORT extern const char kHomedir[];
 CHROMEOS_EXPORT extern const char kHostPairingOobe[];
 CHROMEOS_EXPORT extern const char kIgnoreUserProfileMappingForTests[];
-CHROMEOS_EXPORT extern const char kInternalDisplayColorProfileFile[];
 CHROMEOS_EXPORT extern const char kLoginManager[];
 CHROMEOS_EXPORT extern const char kLoginProfile[];
 CHROMEOS_EXPORT extern const char kLoginUser[];

diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
@@ -754,17 +754,6 @@ bool DisplayConfigurator::SetColorCalibrationProfile(
   return false;
 }
 
-bool DisplayConfigurator::SetGammaRamp(
-    int64_t display_id,
-    const std::vector<GammaRampRGBEntry>& lut) {
-  for (const DisplaySnapshot* display : cached_displays_) {
-    if (display->display_id() == display_id)
-      return native_display_delegate_->SetGammaRamp(*display, lut);
-  }
-
-  return false;
-}
-
 void DisplayConfigurator::PrepareForExit() {
   configure_display_ = false;
 }

diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
@@ -30,8 +30,6 @@ class Size;
 }
 
 namespace ui {
-struct DisplayConfigureRequest;
-struct GammaRampRGBEntry;
 class DisplayLayoutManager;
 class DisplayMode;
 class DisplaySnapshot;
@@ -262,10 +260,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   bool SetColorCalibrationProfile(int64_t display_id,
                                   ui::ColorCalibrationProfile new_profile);
 
-  // Sets the gamma ramp for |display_id| to the values in |lut|.
-  bool SetGammaRamp(int64_t display_id,
-                    const std::vector<GammaRampRGBEntry>& lut);
-
  private:
   class DisplayLayoutManagerImpl;
 

diff --git a/ui/display/chromeos/test/action_logger_util.cc b/ui/display/chromeos/test/action_logger_util.cc
@@ -5,12 +5,9 @@
 #include "ui/display/chromeos/test/action_logger_util.h"
 
 #include "base/format_macros.h"
-#include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
-#include "ui/display/types/gamma_ramp_rgb_entry.h"
-#include "ui/display/types/native_display_delegate.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -55,18 +52,6 @@ std::string GetSetHDCPStateAction(const DisplaySnapshot& output,
                             output.display_id(), state);
 }
 
-std::string SetGammaRampAction(const ui::DisplaySnapshot& output,
-                               const std::vector<GammaRampRGBEntry>& lut) {
-  std::string table;
-  for (size_t i = 0; i < lut.size(); ++i) {
-    table += base::StringPrintf(",rgb[%" PRIuS "]=%04x%04x%04x", i, lut[i].r,
-                                lut[i].g, lut[i].b);
-  }
-
-  return base::StringPrintf("set_gamma_ramp(id=%" PRId64 "%s)",
-                            output.display_id(), table.c_str());
-}
-
 std::string JoinActions(const char* action, ...) {
   std::string actions;
 

diff --git a/ui/display/chromeos/test/action_logger_util.h b/ui/display/chromeos/test/action_logger_util.h
@@ -6,7 +6,6 @@
 #define UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
 
 #include <string>
-#include <vector>
 
 #include "ui/display/types/display_constants.h"
 
@@ -17,7 +16,6 @@ class Size;
 
 namespace ui {
 
-struct GammaRampRGBEntry;
 class DisplayMode;
 class DisplaySnapshot;
 
@@ -64,9 +62,6 @@ std::string GetFramebufferAction(const gfx::Size& size,
 std::string GetSetHDCPStateAction(const DisplaySnapshot& output,
                                   HDCPState state);
 
-// Returns a string describing a TestNativeDisplayDelegate::SetGammaRamp() call;
-std::string SetGammaRampAction(const ui::DisplaySnapshot& output,
-                               const std::vector<GammaRampRGBEntry>& lut);
 // Joins a sequence of strings describing actions (e.g. kScreenDim) such
 // that they can be compared against a string returned by
 // ActionLogger::GetActionsAndClear().  The list of actions must be