Commit b4d09b93 authored by noel's avatar noel Committed by Commit bot

Revert of [Mac] Implement a new WebSandboxSupport method to get the display's...

Revert of [Mac] Implement a new WebSandboxSupport method to get the display's color space. (patchset #1 id:1 of https://codereview.chromium.org/549213004/)

Reason for revert:
Not needed, used https://codereview.chromium.org/554033002 instead.

Original issue's description:
> [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
>
> Committed: https://crrev.com/b6ae4d0ecc983a71a32ab1480a70e065c718c195
> Cr-Commit-Position: refs/heads/master@{#293852}

TBR=avi@chromium.org,rsesek@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=397642,306348

Review URL: https://codereview.chromium.org/563943003

Cr-Commit-Position: refs/heads/master@{#294786}
parent b918671e
......@@ -19,7 +19,6 @@
#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"
......@@ -49,7 +48,6 @@ 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)
......@@ -97,11 +95,6 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
return false;
}
CGColorSpaceRef
PpapiWebKitPlatformSupportImpl::SandboxSupport::displayColorSpace() {
return base::mac::GetSystemColorSpace();
}
#elif defined(OS_ANDROID)
// Empty class.
......
......@@ -84,7 +84,6 @@
#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"
......@@ -203,7 +202,6 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport
NSFont* src_font,
CGFontRef* container,
uint32* font_id);
virtual CGColorSpaceRef displayColorSpace();
#elif defined(OS_POSIX)
virtual void getFallbackFontForCharacter(
blink::WebUChar32 character,
......@@ -575,11 +573,6 @@ 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment