Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm - Issue 13905007: Remove the last remaining PLATFORM() bits from WebCore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

Issue 13905007: Remove the last remaining PLATFORM() bits from WebCore. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: fffffffffff Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm ('k') | Source/WebCore/platform/graphics/mac/FontCacheMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

index fabc057c7d8d2b843b1956f81548056b2a08e1f4..20f58795c87b3a7f43b0526ef2710da4bbc8b69b 100644

--- a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

+++ b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

@@ -33,15 +33,6 @@

#include <ApplicationServices/ApplicationServices.h>

-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050

-// The following symbols are SPI in 10.5.

-extern "C" {

-void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]);

-const CGSize* CTRunGetAdvancesPtr(CTRunRef run);

-extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;

-#endif

@interface WebCascadeList : NSArray {

@private

const WebCore::Font* _font;

@@ -226,7 +217,7 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,

static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

ProviderInfo info = { cp, length, stringAttributes.get() };

RetainPtr<CTTypesetterRef> typesetter(AdoptCF, wkCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));

#else