Color: Rename gfx::ColorProfile to gfx::ColorSpace

This is more accurate terminology. A color space can be represented
by ICC profile. There isn't really such a thing as a "color profile".

BUG=622133

Review-Url: https://codereview.chromium.org/2106303002
Cr-Commit-Position: refs/heads/master@{#403275}

content/browser/renderer_host/render_message_filter.cc

@@ -70,7 +70,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
-#include "ui/gfx/color_profile.h"
 #include "url/gurl.h"
 
 #if defined(OS_MACOSX)

content/browser/renderer_host/render_view_host_impl.cc

@@ -87,7 +87,7 @@
 #include "ui/base/touch/touch_enabled.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/animation/animation.h"
-#include "ui/gfx/color_profile.h"
+#include "ui/gfx/color_space.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/native_theme/native_theme_switches.h"
@@ -371,7 +371,7 @@ bool RenderViewHostImpl::CreateRenderView(
   params.max_size = GetWidget()->max_size_for_auto_resize();
   params.page_zoom_level = delegate_->GetPendingPageZoomLevel();
   params.image_decode_color_profile =
-      gfx::ColorProfile::GetFromBestMonitor().profile();
+      gfx::ColorSpace::FromBestMonitor().GetICCProfile();
   GetWidget()->GetResizeParams(&params.initial_size);
 
   if (!Send(new ViewMsg_New(params)))

content/browser/renderer_host/render_widget_host_impl.cc

@@ -76,7 +76,7 @@
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/color_profile.h"
+#include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ -221,10 +221,10 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
 #if defined(OS_WIN)
   // Update the display color profile cache so that it is likely to be up to
   // date when the renderer process requests the color profile.
-  if (gfx::ColorProfile::CachedProfilesNeedUpdate()) {
+  if (gfx::ColorSpace::CachedProfilesNeedUpdate()) {
     BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
-        base::Bind(&gfx::ColorProfile::UpdateCachedProfilesOnBackgroundThread));
+        base::Bind(&gfx::ColorSpace::UpdateCachedProfilesOnBackgroundThread));
   }
 #endif
 

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -83,7 +83,6 @@
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/color_profile.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -81,7 +81,6 @@
 #include "ui/display/screen.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/color_profile.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect_conversions.h"

content/renderer/renderer_blink_platform_impl.cc

@@ -103,7 +103,6 @@
 #include "third_party/WebKit/public/platform/mime_registry.mojom.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionListener.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationListener.h"
-#include "ui/gfx/color_profile.h"
 #include "url/gurl.h"
 
 #if defined(OS_MACOSX)

ui/gfx/BUILD.gn

@@ -62,10 +62,10 @@ component("gfx") {
     "color_analysis.cc",
     "color_analysis.h",
     "color_palette.h",
-    "color_profile.cc",
-    "color_profile.h",
-    "color_profile_mac.mm",
-    "color_profile_win.cc",
+    "color_space.cc",
+    "color_space.h",
+    "color_space_mac.mm",
+    "color_space_win.cc",
     "color_utils.cc",
     "color_utils.h",
     "favicon_size.cc",

ui/gfx/color_profile.cc → ui/gfx/color_space.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "build/build_config.h"
-#include "ui/gfx/color_profile.h"
+#include "ui/gfx/color_space.h"
 
 namespace gfx {
 
@@ -12,27 +12,32 @@ static const size_t kMinProfileLength = 128;
 static const size_t kMaxProfileLength = 4 * 1024 * 1024;
 }
 
-ColorProfile::ColorProfile(const std::vector<char>& profile)
-    : profile_(profile) {
-  if (!IsValidProfileLength(profile_.size()))
-    profile_.clear();
+ColorSpace::ColorSpace() = default;
+ColorSpace::ColorSpace(ColorSpace&& other) = default;
+ColorSpace::ColorSpace(const ColorSpace& other) = default;
+ColorSpace& ColorSpace::operator=(const ColorSpace& other) = default;
+ColorSpace::~ColorSpace() = default;
+
+bool ColorSpace::operator==(const ColorSpace& other) const {
+  return icc_profile_ == other.icc_profile_;
 }
 
-ColorProfile::ColorProfile() = default;
-ColorProfile::ColorProfile(ColorProfile&& other) = default;
-ColorProfile::ColorProfile(const ColorProfile& other) = default;
-ColorProfile& ColorProfile::operator=(const ColorProfile& other) = default;
-ColorProfile::~ColorProfile() = default;
+ColorSpace ColorSpace::FromICCProfile(const std::vector<char>& icc_profile) {
+  ColorSpace color_space;
+  if (IsValidProfileLength(icc_profile.size()))
+    color_space.icc_profile_ = icc_profile;
+  return color_space;
+}
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX)
 // static
-ColorProfile ColorProfile::GetFromBestMonitor() {
-  return ColorProfile();
+ColorSpace ColorSpace::FromBestMonitor() {
+  return ColorSpace();
 }
 #endif
 
 // static
-bool ColorProfile::IsValidProfileLength(size_t length) {
+bool ColorSpace::IsValidProfileLength(size_t length) {
   return length >= kMinProfileLength && length <= kMaxProfileLength;
 }
 

ui/gfx/color_profile.h → ui/gfx/color_space.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_COLOR_PROFILE_H_
-#define UI_GFX_COLOR_PROFILE_H_
+#ifndef UI_GFX_COLOR_SPACE_H_
+#define UI_GFX_COLOR_SPACE_H_
 
 #include <vector>
 
@@ -13,36 +13,36 @@
 
 namespace gfx {
 
-class GFX_EXPORT ColorProfile {
+class GFX_EXPORT ColorSpace {
  public:
-  ColorProfile(const std::vector<char>& profile);
-  ColorProfile();
-  ColorProfile(ColorProfile&& other);
-  ColorProfile(const ColorProfile& other);
-  ColorProfile& operator=(const ColorProfile& other);
-  ~ColorProfile();
+  ColorSpace();
+  ColorSpace(ColorSpace&& other);
+  ColorSpace(const ColorSpace& other);
+  ColorSpace& operator=(const ColorSpace& other);
+  ~ColorSpace();
+  bool operator==(const ColorSpace& other) const;
 
-  const std::vector<char>& profile() const { return profile_; }
+  // Returns the color profile of the monitor that can best represent color.
+  // This profile should be used for creating content that does not know on
+  // which monitor it will be displayed.
+  static ColorSpace FromBestMonitor();
+  static ColorSpace FromICCProfile(const std::vector<char>& icc_profile);
+
+  const std::vector<char>& GetICCProfile() const { return icc_profile_; }
 
 #if defined(OS_WIN)
-  // This will read color profile information from disk and cache the results
-  // for the other functions to read. This should not be called on the UI or IO
-  // thread.
+  // This will read monitor ICC profiles from disk and cache the results for the
+  // other functions to read. This should not be called on the UI or IO thread.
   static void UpdateCachedProfilesOnBackgroundThread();
   static bool CachedProfilesNeedUpdate();
 #endif
 
-  // Returns the color profile of the monitor that can best represent color.
-  // This profile should be used for creating content that does not know on
-  // which monitor it will be displayed.
-  static ColorProfile GetFromBestMonitor();
-
   static bool IsValidProfileLength(size_t length);
 
  private:
-  std::vector<char> profile_;
+  std::vector<char> icc_profile_;
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_COLOR_PROFILE_H_
+#endif  // UI_GFX_COLOR_SPACE_H_

ui/gfx/color_profile_mac.mm → ui/gfx/color_space_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/color_profile.h"
+#include "ui/gfx/color_space.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
@@ -14,19 +14,19 @@
 namespace gfx {
 
 // static
-ColorProfile ColorProfile::GetFromBestMonitor() {
-  ColorProfile profile;
+ColorSpace ColorSpace::FromBestMonitor() {
+  ColorSpace color_space;
   CGColorSpaceRef monitor_color_space(base::mac::GetSystemColorSpace());
   base::ScopedCFTypeRef<CFDataRef> icc_profile(
       CGColorSpaceCopyICCProfile(monitor_color_space));
   if (!icc_profile)
-    return profile;
+    return color_space;
   size_t length = CFDataGetLength(icc_profile);
   if (!IsValidProfileLength(length))
-    return profile;
+    return color_space;
   const unsigned char* data = CFDataGetBytePtr(icc_profile);
-  profile.profile_.assign(data, data + length);
-  return profile;
+  color_space.icc_profile_.assign(data, data + length);
+  return color_space;
 }
 
 }  // namespace gfx

ui/gfx/color_profile_win.cc → ui/gfx/color_space_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/color_profile.h"
+#include "ui/gfx/color_space.h"
 
 #include <windows.h>
 #include <stddef.h>
@@ -17,7 +17,7 @@ namespace gfx {
 
 namespace {
 
-void ReadBestMonitorColorProfile(std::vector<char>* profile) {
+void ReadBestMonitorICCProfile(std::vector<char>* profile) {
   HDC screen_dc = GetDC(NULL);
   DWORD path_len = MAX_PATH;
   WCHAR path[MAX_PATH + 1];
@@ -26,43 +26,43 @@ void ReadBestMonitorColorProfile(std::vector<char>* profile) {
   ReleaseDC(NULL, screen_dc);
   if (!result)
     return;
-  std::string profileData;
-  if (!base::ReadFileToString(base::FilePath(path), &profileData))
+  std::string profile_data;
+  if (!base::ReadFileToString(base::FilePath(path), &profile_data))
     return;
-  size_t length = profileData.size();
-  if (!ColorProfile::IsValidProfileLength(length))
+  size_t length = profile_data.size();
+  if (!ColorSpace::IsValidProfileLength(length))
     return;
-  profile->assign(profileData.data(), profileData.data() + length);
+  profile->assign(profile_data.data(), profile_data.data() + length);
 }
 
-base::LazyInstance<base::Lock> g_best_color_profile_lock =
+base::LazyInstance<base::Lock> g_best_monitor_color_space_lock =
     LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<gfx::ColorProfile> g_best_color_profile =
+base::LazyInstance<gfx::ColorSpace> g_best_monitor_color_space =
     LAZY_INSTANCE_INITIALIZER;
-bool g_has_initialized_best_color_profile = false;
+bool g_has_initialized_best_monitor_color_space = false;
 
 }  // namespace
 
 // static
-ColorProfile ColorProfile::GetFromBestMonitor() {
-  base::AutoLock lock(g_best_color_profile_lock.Get());
-  return g_best_color_profile.Get();
+ColorSpace ColorSpace::FromBestMonitor() {
+  base::AutoLock lock(g_best_monitor_color_space_lock.Get());
+  return g_best_monitor_color_space.Get();
 }
 
 // static
-bool ColorProfile::CachedProfilesNeedUpdate() {
-  base::AutoLock lock(g_best_color_profile_lock.Get());
-  return !g_has_initialized_best_color_profile;
+bool ColorSpace::CachedProfilesNeedUpdate() {
+  base::AutoLock lock(g_best_monitor_color_space_lock.Get());
+  return !g_has_initialized_best_monitor_color_space;
 }
 
 // static
-void ColorProfile::UpdateCachedProfilesOnBackgroundThread() {
-  std::vector<char> profile;
-  ReadBestMonitorColorProfile(&profile);
+void ColorSpace::UpdateCachedProfilesOnBackgroundThread() {
+  std::vector<char> icc_profile;
+  ReadBestMonitorICCProfile(&icc_profile);
 
-  base::AutoLock lock(g_best_color_profile_lock.Get());
-  g_best_color_profile.Get().profile_ = profile;
-  g_has_initialized_best_color_profile = true;
+  base::AutoLock lock(g_best_monitor_color_space_lock.Get());
+  g_best_monitor_color_space.Get().icc_profile_ = icc_profile;
+  g_has_initialized_best_monitor_color_space = true;
 }
 
 }  // namespace gfx

ui/gfx/gfx.gyp

@@ -196,10 +196,10 @@
         'color_analysis.cc',
         'color_analysis.h',
         'color_palette.h',
-        'color_profile.cc',
-        'color_profile.h',
-        'color_profile_mac.mm',
-        'color_profile_win.cc',
+        'color_space.cc',
+        'color_space.h',
+        'color_space_mac.mm',
+        'color_space_win.cc',
         'color_utils.cc',
         'color_utils.h',
         'favicon_size.cc',