[Mac] Implement a new WebSandboxSupport method to get the display's color space.

content/renderer/renderer_webkitplatformsupport_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 66 matching lines @@
 #include "url/gurl.h"
 #include "webkit/common/gpu/context_provider_web_context.h"
 #include "webkit/common/quota/quota_types.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/media/android/audio_decoder_android.h"
 #endif
 
 #if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
 #include "content/common/mac/font_descriptor.h"
 #include "content/common/mac/font_loader.h"
 #include "content/renderer/webscrollbarbehavior_impl_mac.h"
 #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include <map>
@@ skipping 98 matching lines @@
  public:
   virtual ~SandboxSupport() {}
 
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
   virtual bool loadFont(
       NSFont* src_font,
       CGFontRef* container,
       uint32* font_id);
+  virtual CGColorSpaceRef displayColorSpace();
 #elif defined(OS_POSIX)
   virtual void getFallbackFontForCharacter(
       blink::WebUChar32 character,
       const char* preferred_locale,
       blink::WebFallbackFont* fallbackFont);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
@@ skipping 351 matching lines @@
     return false;
   }
 
   // TODO(jeremy): Need to call back into WebKit to make sure that the font
   // isn't already activated, based on the font id.  If it's already
   // activated, don't reactivate it here - crbug.com/72727 .
 
   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
 }
 
+CGColorSpaceRef
+RendererWebKitPlatformSupportImpl::SandboxSupport::displayColorSpace() {
+  return base::mac::GetSystemColorSpace();

[Noel Gordon, 2014/09/10 07:35:37]

This could be called on an arbitrary thread, such as an impl-side-painting
thread for example.  Are we thread-safe here?

Also, what color profile does this return (aka for which screen)?

(Sorry to ask these question, but the the change description doesn't tell me why
we're making this change).

[Noel Gordon, 2014/09/10 07:52:50]

And it seems we're not; the other code review 

https://codereview.chromium.org/554033002

appears to be crashing image decoder unit tests, which is new.

[Robert Sesek, 2014/09/10 14:34:12]

That has nothing to do with thread safety. There's no sandboxSupport in webkit
tests. Yes, this is thread safe. It's also identical to what gfx::ColorProfile's
ctor does.

+}
+
 #elif defined(OS_ANDROID)
 
 // WebKit doesn't use WebSandboxSupport on android so we don't need to
 // implement anything here. This is cleaner to support than excluding the
 // whole class for android.
 
 #elif defined(OS_POSIX)
 
 void
 RendererWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
@@ skipping 241 matching lines @@
       challenge.utf8(),
       GURL(url),
       &signed_public_key));
   return WebString::fromUTF8(signed_public_key);
 }
 
 //------------------------------------------------------------------------------
 
 void RendererWebKitPlatformSupportImpl::screenColorProfile(
     WebVector<char>* to_profile) {
 #if defined(OS_WIN)

[Noel Gordon, 2014/09/10 07:35:37]

Wonder what's going on here.  See the comment at line 854.  Doesn't
gfx::ColorProfile profile provide what you want?

[Robert Sesek, 2014/09/10 14:34:12]

Sorry, I didn't see this method. I'll see if this can be used instead.

   // On Windows screen color profile is only available in the browser.
   std::vector<char> profile;
   // This Send() can be called from any impl-side thread. Use a thread
   // safe send to avoid crashing trying to access RenderThread::Get(),
   // which is not accessible from arbitrary threads.
   thread_safe_sender_->Send(
       new ViewHostMsg_GetMonitorColorProfile(&profile));
   *to_profile = profile;
 #else
   // On other platforms, the primary monitor color profile can be read
@@ skipping 334 matching lines @@
 void RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(
     const blink::WebBatteryStatus& status) {
   PlatformEventObserverBase* observer =
       platform_event_observers_.Lookup(blink::WebPlatformEventBattery);
   if (!observer)
     return;
   observer->SendFakeDataForTesting((void*)&status);
 }
 
 }  // namespace content