Skip to content

Commit e72d1c0

Browse files
zenoalbisserbbandix
authored andcommitted
<third_party/WebKit> Remove leftovers from WebKitSystemInterface
Change-Id: I4a494bcda0e963430ab997664728d2a96f72188f Reviewed-by: Zeno Albisser <[email protected]>
1 parent 660bf67 commit e72d1c0

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

chromium/third_party/WebKit/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,9 @@ - (id)objectAtIndex:(NSUInteger)index
223223
static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
224224
static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
225225

226-
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
227-
ProviderInfo info = { cp, length, stringAttributes.get() };
228-
RetainPtr<CTTypesetterRef> typesetter(AdoptCF, WKCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
229-
#else
230226
RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, cp, length, kCFAllocatorNull));
231227
RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(kCFAllocatorDefault, string.get(), stringAttributes.get()));
232228
RetainPtr<CTTypesetterRef> typesetter(AdoptCF, CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
233-
#endif
234229

235230
line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));
236231
} else {

0 commit comments

Comments
 (0)