Finish moving CTFontGetVerticalGlyphsForCharacters and CTLineCreateWithUniCharProvide...
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Nov 2014 21:37:03 +0000 (21:37 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Nov 2014 21:37:03 +0000 (21:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=138623

Reviewed by Geoff Garen.

Source/WebCore:

No new tests because there is no behavior change.

* WebCore.exp.in:
* WebCore.order:
* platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
(WebCore::GlyphPage::fill):
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::canRenderCombiningCharacterSequence):
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/spi/cocoa/CoreTextSPI.h:

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
* WebKit.order:

Source/WebKit2:

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
* mac/WebKit2.order:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.order
Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit/mac/WebKit.order
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
Source/WebKit2/mac/WebKit2.order

index a8141cf..622ed2b 100644 (file)
@@ -1,5 +1,25 @@
 2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        Finish moving CTFontGetVerticalGlyphsForCharacters and CTLineCreateWithUniCharProvider out from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=138623
+
+        Reviewed by Geoff Garen.
+
+        No new tests because there is no behavior change.
+
+        * WebCore.exp.in:
+        * WebCore.order:
+        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+        (WebCore::GlyphPage::fill):
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::canRenderCombiningCharacterSequence):
+        * platform/ios/WebCoreSystemInterfaceIOS.mm:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+        * platform/spi/cocoa/CoreTextSPI.h:
+
+2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
+
         Unreviewed Mountain Lion build fix
 
         * platform/spi/cocoa/CoreTextSPI.h:
index 0400ebb..f1a9efe 100644 (file)
@@ -2156,8 +2156,6 @@ _wkCopyHTTPCookieStorage
 _wkCopyNSURLResponseCertificateChain
 _wkCopyNSURLResponseStatusLine
 _wkCopyRequestWithStorageSession
-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
 _wkCreatePrivateStorageSession
 _wkDeleteAllHTTPCookies
 _wkDeleteHTTPCookie
@@ -2451,7 +2449,6 @@ _wkGetHyphenationLocationBeforeIndex
 _wkGetNSEventKeyChar
 _wkGetNSURLResponseCalculatedExpiration
 _wkGetNSURLResponseMustRevalidate
-_wkGetVerticalGlyphsForCharacters
 _wkGetWheelEventDeltas
 _wkHitTestMediaUIPart
 _wkMeasureMediaUIPart
@@ -2863,7 +2860,6 @@ _wkGetScreenScaleFactor
 _wkGetScreenSize
 _wkGetUserAgent
 _wkGetVendorNameForNavigator
-_wkGetVerticalGlyphsForCharacters
 _wkIsGB18030ComplianceRequired
 _wkIsOptimizedFullscreenSupported
 _wkSetLayerContentsScale
index 7af6df2..1bd9d08 100644 (file)
@@ -30589,9 +30589,6 @@ _wkSetHTTPPipeliningMinimumFastLanePriority
 _wkSetCONNECTProxyForStream
 _wkSetCONNECTProxyAuthorizationForStream
 _wkCopyCONNECTProxyResponse
-_wkGetVerticalGlyphsForCharacters
-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
 _wkIOSurfaceContextCreate
 _wkIOSurfaceContextCreateImage
 _wkRecommendedScrollerStyle
index bcdb765..a88ed84 100644 (file)
@@ -30,6 +30,7 @@
 #include "GlyphPageTreeNode.h"
 
 #include "CGFontUnicodeSupportSPI.h"
+#include "CoreTextSPI.h"
 #include "Font.h"
 #include "SimpleFontData.h"
 #include "WebCoreSystemInterface.h"
@@ -83,9 +84,9 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
                 haveGlyphs = true;
             }
         }
-    } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
+    } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? CTFontGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
                : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
-        // When buffer consists of surrogate pairs, wkGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
+        // When buffer consists of surrogate pairs, CTFontGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
         // place the glyphs at indices corresponding to the first character of each pair.
         unsigned glyphStep = bufferLength / length;
         for (unsigned i = 0; i < length; ++i) {
index 63873dc..a89e624 100644 (file)
@@ -29,6 +29,7 @@
 
 #import "BlockExceptions.h"
 #import "Color.h"
+#import "CoreTextSPI.h"
 #import "FloatRect.h"
 #import "Font.h"
 #import "FontCache.h"
@@ -492,7 +493,7 @@ bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters
     RetainPtr<CGFontRef> cgFont = adoptCF(CTFontCopyGraphicsFont(platformData().ctFont(), 0));
 
     ProviderInfo info = { characters, length, getCFStringAttributes(0, platformData().orientation()) };
-    RetainPtr<CTLineRef> line = adoptCF(wkCreateCTLineWithUniCharProvider(&provideStringAndAttributes, 0, &info));
+    RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info));
 
     CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
     CFIndex runCount = CFArrayGetCount(runArray);
index 5d62a7e..90a87e2 100644 (file)
@@ -71,11 +71,6 @@ WEBCORE_EXPORT void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRe
 WEBCORE_EXPORT void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
 #endif
 
-WEBCORE_EXPORT bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-WEBCORE_EXPORT CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-
-WEBCORE_EXPORT CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
-
 #if !PLATFORM(IOS_SIMULATOR)
 WEBCORE_EXPORT CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
 WEBCORE_EXPORT CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
index ea86af2..2a2ae57 100644 (file)
@@ -226,18 +226,12 @@ extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost
 extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
 
-extern bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
 extern BOOL (*wkUseSharedMediaUI)();
 
 #if !PLATFORM(IOS)
 extern void* wkGetHyphenationLocationBeforeIndex;
 #endif
 
-extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-
-extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
-
 #if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
 extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
 extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
index 395a849..5b570fd 100644 (file)
@@ -104,14 +104,8 @@ void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
 void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
 #endif
 
-bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
 void* wkGetHyphenationLocationBeforeIndex;
 
-CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-
-CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
-
 CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
 CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
 
index d4eaab8..a5feabb 100644 (file)
@@ -50,6 +50,7 @@ CGSize CTRunGetInitialAdvance(CTRunRef run);
 CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon);
 CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon, CFDictionaryRef options);
 bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);
+bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
 
 }
 
index 45d6fb3..497e0a4 100644 (file)
@@ -1,3 +1,14 @@
+2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Finish moving CTFontGetVerticalGlyphsForCharacters and CTLineCreateWithUniCharProvider out from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=138623
+
+        Reviewed by Geoff Garen.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+        * WebKit.order:
+
 2014-11-11  Tim Horton  <timothy_horton@apple.com>
 
         Localize strings for action menus
index 529e7dd..cbd126e 100644 (file)
@@ -120,7 +120,6 @@ void InitWebCoreSystemInterface(void)
     INIT(QTClearMediaDownloadCache);
 #endif
 
-    INIT(GetVerticalGlyphsForCharacters);
 #if PLATFORM(IOS)
     INIT(ExecutableWasLinkedOnOrAfterIOSVersion);
     INIT(GetDeviceClass);
@@ -132,13 +131,10 @@ void InitWebCoreSystemInterface(void)
     INIT(GetMediaUIImageData);
 #endif
 
-    INIT(CreateCTLineWithUniCharProvider);
-
 #if !PLATFORM(IOS_SIMULATOR)
     INIT(IOSurfaceContextCreate);
     INIT(IOSurfaceContextCreateImage);
 #endif
-    INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
 #if !PLATFORM(IOS)
     INIT(RecommendedScrollerStyle);
     INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
index b526cc3..cb63d2a 100644 (file)
@@ -733,7 +733,6 @@ _WKSetNSURLRequestShouldContentSniff
 _WKGetCFURLResponseMIMEType
 __ZN20WebFrameLoaderClient38dispatchDidLoadResourceFromMemoryCacheEPN7WebCore14DocumentLoaderERKNS0_15ResourceRequestERKNS0_16ResourceResponseEi
 -[WebFrame(WebInternal) _characterRangeAtPoint:]
-_WKCreateCTTypesetterWithUniCharProviderAndOptions
 -[WebView(WebViewEditing) selectedDOMRange]
 -[WebHTMLRepresentation attributedStringFrom:startOffset:to:endOffset:]
 -[WebHTMLView shouldDelayWindowOrderingForEvent:]
@@ -1530,7 +1529,6 @@ __ZN7WebCore17FrameLoaderClient13didChangeNameERKN3WTF6StringE
 -[WebBackForwardList addItem:]
 __Z4coreP14WebHistoryItem
 -[WebBackForwardList goToItem:]
-_WKCreateCTLineWithUniCharProvider
 -[WebInspector show:]
 -[WebInspector showWindow]
 __ZN18WebInspectorClient21openInspectorFrontendEPN7WebCore19InspectorControllerE
@@ -2313,8 +2311,6 @@ __ZN20WebContextMenuClient10isSpeakingEv
 -[WebHTMLView(WebNSTextInputSupport) selectedRange]
 -[WebFrame(WebPrivate) _selectedNSRange]
 -[WebFrameView _pageHorizontally:]
-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
 __ZThn8_N15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE
 __ZN15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE
 __ZN3WTF6VectorINS_6StringELm0ENS_15CrashOnOverflowEE14shrinkCapacityEm
index bd3ab5d..55cbea4 100644 (file)
@@ -1,3 +1,14 @@
+2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Finish moving CTFontGetVerticalGlyphsForCharacters and CTLineCreateWithUniCharProvider out from WKSI
+        https://bugs.webkit.org/show_bug.cgi?id=138623
+
+        Reviewed by Geoff Garen.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+        * mac/WebKit2.order:
+
 2014-11-11  Timothy Horton  <timothy_horton@apple.com>
 
         Add a respondsToSelector check to dismissActionMenuPopovers
index 5b95f91..df5c7f3 100644 (file)
@@ -49,7 +49,6 @@ void InitWebCoreSystemInterface(void)
         INIT(CopyCONNECTProxyResponse);
         INIT(CopyNSURLResponseStatusLine);
         INIT(CopyNSURLResponseCertificateChain);
-        INIT(CreateCTLineWithUniCharProvider);
 #if !PLATFORM(IOS)
         INIT(DrawBezeledTextArea);
         INIT(DrawCapsLockIndicator);
@@ -61,7 +60,6 @@ void InitWebCoreSystemInterface(void)
         INIT(GetFontInLanguageForCharacter);
         INIT(GetFontInLanguageForRange);
 #endif
-        INIT(GetVerticalGlyphsForCharacters);
         INIT(GetHTTPRequestPriority);
         INIT(GetNSURLResponseLastModifiedDate);
 #if !PLATFORM(IOS)
@@ -128,7 +126,6 @@ void InitWebCoreSystemInterface(void)
         INIT(IOSurfaceContextCreate);
         INIT(IOSurfaceContextCreateImage);
 #endif // !PLATFORM(IOS_SIMULATOR)
-        INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
 #if !PLATFORM(IOS)
         INIT(RecommendedScrollerStyle);
         INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
index 87213ad..9f7feb7 100644 (file)
@@ -944,8 +944,6 @@ __ZN6WebKit18WebBackForwardList8backItemEv
 _WKPageCanGoForward
 __ZNK6WebKit12WebPageProxy12canGoForwardEv
 __ZN6WebKit18WebBackForwardList11forwardItemEv
-_WKCreateCTLineWithUniCharProvider
-_WKCreateCTTypesetterWithUniCharProviderAndOptions
 _WKSetCGFontRenderingMode
 -[WKView(Private) updateLayer]
 -[WKView drawsBackground]
@@ -9141,8 +9139,6 @@ __ZN6WebKit15WebChromeClient9takeFocusEN7WebCore14FocusDirectionE
 __ZN7CoreIPC13MessageSender4sendIN8Messages12WebPageProxy9TakeFocusEEEbRKT_y
 __ZN6WebKit12WebPageProxy9takeFocusEj
 __ZN6WebKit11WebUIClient9takeFocusEPNS_12WebPageProxyEj
-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
 __ZN6WebKit15WebChromeClient19customHighlightRectEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectE
 __ZN6WebKit15WebChromeClient20paintCustomHighlightEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectESA_bb
 _WKBundlePageFindString