diff options
| author | rsesek <rsesek@chromium.org> | 2014-09-08 21:58:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 05:43:50 +0000 |
| commit | b6ae4d0ecc983a71a32ab1480a70e065c718c195 (patch) | |
| tree | cd307012c394af38cd17b34d1b92b36f0961563f /content | |
| parent | ff459d4eeb89479ae810f6be3d3b5b50fef3324a (diff) | |
| download | chromium_src-b6ae4d0ecc983a71a32ab1480a70e065c718c195.zip chromium_src-b6ae4d0ecc983a71a32ab1480a70e065c718c195.tar.gz chromium_src-b6ae4d0ecc983a71a32ab1480a70e065c718c195.tar.bz2 | |
[Mac] Implement a new WebSandboxSupport method to get the display's color space.
This new interface is defined at https://codereview.chromium.org/554033002/.
BUG=397642,306348
R=avi@chromium.org
Review URL: https://codereview.chromium.org/549213004
Cr-Commit-Position: refs/heads/master@{#293852}
Diffstat (limited to 'content')
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc | 7 | ||||
| -rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.cc | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index c4a1153..ef6cccc 100644 --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc @@ -19,6 +19,7 @@ #if defined(OS_WIN) #include "third_party/WebKit/public/platform/win/WebSandboxSupport.h" #elif defined(OS_MACOSX) +#include "base/mac/mac_util.h" #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h" #elif defined(OS_ANDROID) #include "third_party/WebKit/public/platform/android/WebSandboxSupport.h" @@ -48,6 +49,7 @@ class PpapiWebKitPlatformSupportImpl::SandboxSupport #elif defined(OS_MACOSX) virtual bool loadFont( NSFont* srcFont, CGFontRef* out, uint32_t* fontID); + virtual CGColorSpaceRef displayColorSpace(); #elif defined(OS_ANDROID) // Empty class. #elif defined(OS_POSIX) @@ -95,6 +97,11 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont( return false; } +CGColorSpaceRef +PpapiWebKitPlatformSupportImpl::SandboxSupport::displayColorSpace() { + return base::mac::GetSystemColorSpace(); +} + #elif defined(OS_ANDROID) // Empty class. diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 797285f..e607b5c 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -84,6 +84,7 @@ #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" @@ -202,6 +203,7 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport NSFont* src_font, CGFontRef* container, uint32* font_id); + virtual CGColorSpaceRef displayColorSpace(); #elif defined(OS_POSIX) virtual void getFallbackFontForCharacter( blink::WebUChar32 character, @@ -573,6 +575,11 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont( return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } +CGColorSpaceRef +RendererWebKitPlatformSupportImpl::SandboxSupport::displayColorSpace() { + return base::mac::GetSystemColorSpace(); +} + #elif defined(OS_ANDROID) // WebKit doesn't use WebSandboxSupport on android so we don't need to |