Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

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

Issue 14856004: Finish removing WebKitSystemInterface from Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Simplify 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
Index: Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
diff --git a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
index 20ec02f8b0d72844135b26c08170c815385819fb..c0f2606f4e474e95382614be9ce8eeba14084cfc 100644
--- a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
+++ b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
@@ -29,10 +29,15 @@
#include "core/platform/graphics/Font.h"
#include "core/platform/graphics/FontCache.h"
#include "core/platform/graphics/TextRun.h"
-#include "core/platform/mac/WebCoreSystemInterface.h"
#include <ApplicationServices/ApplicationServices.h>
+// Forward declare Mac SPIs.
+extern "C" {
+// Request for public API: rdar://13803619
+CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (*dispose)(const UniChar* chars, void* context), void* context);
+}
+
@interface WebCascadeList : NSArray {
@private
const WebCore::Font* _font;
@@ -230,7 +235,7 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
} else {
ProviderInfo info = { cp, length, stringAttributes.get() };
- line.adoptCF(WKCreateCTLineWithUniCharProvider(&provideStringAndAttributes, 0, &info));
+ line.adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info));
}
m_coreTextLines.append(line.get());

Powered by Google App Engine
This is Rietveld 408576698