diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-06-27 19:21:34 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:15:57 +0200 |
| commit | e72d1c05e5c7efbe58a4d5d774daf7f280918271 (patch) | |
| tree | d1e7e7490d17655a96d5e9a0dace498a139cecd5 | |
| parent | 660bf670f40c9feba12f038bcc9e4b620b853803 (diff) | |
<third_party/WebKit> Remove leftovers from WebKitSystemInterface
Change-Id: I4a494bcda0e963430ab997664728d2a96f72188f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm index 822aa8cb8f0..42cdbedf9f2 100644 --- a/chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm +++ b/chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm @@ -223,14 +223,9 @@ 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 __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 RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, cp, length, kCFAllocatorNull)); RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(kCFAllocatorDefault, string.get(), stringAttributes.get())); RetainPtr<CTTypesetterRef> typesetter(AdoptCF, CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions)); -#endif line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0))); } else { |