Changeset 175972 in webkit

Timestamp:

Nov 11, 2014, 1:37:03 PM (11 years ago)

Author:

mmaxfield@apple.com

Message:

Finish moving CTFontGetVerticalGlyphsForCharacters and CTLineCreateWithUniCharProvider out from WKSI
​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:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (3 diffs)
• WebCore/WebCore.order (modified) (1 diff)
• WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp (modified) (2 diffs)
• WebCore/platform/graphics/mac/SimpleFontDataMac.mm (modified) (2 diffs)
• WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (modified) (1 diff)
• WebCore/platform/mac/WebCoreSystemInterface.h (modified) (2 diffs)
• WebCore/platform/mac/WebCoreSystemInterface.mm (modified) (1 diff)
• WebCore/platform/spi/cocoa/CoreTextSPI.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebSystemInterface.mm (modified) (2 diffs)
• WebKit/mac/WebKit.order (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (modified) (3 diffs)
• WebKit2/mac/WebKit2.order (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -2157 +2157 @@
 _wkCopyNSURLResponseStatusLine
 _wkCopyRequestWithStorageSession
-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
 _wkCreatePrivateStorageSession
 _wkDeleteAllHTTPCookies
@@ -2452 +2450 @@
 _wkGetNSURLResponseCalculatedExpiration
 _wkGetNSURLResponseMustRevalidate
-_wkGetVerticalGlyphsForCharacters
 _wkGetWheelEventDeltas
 _wkHitTestMediaUIPart
@@ -2864 +2861 @@
 _wkGetUserAgent
 _wkGetVendorNameForNavigator
-_wkGetVerticalGlyphsForCharacters
 _wkIsGB18030ComplianceRequired
 _wkIsOptimizedFullscreenSupported

trunk/Source/WebCore/WebCore.order

@@ -30590 +30590 @@
 _wkSetCONNECTProxyAuthorizationForStream
 _wkCopyCONNECTProxyResponse
-_wkGetVerticalGlyphsForCharacters
-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
 _wkIOSurfaceContextCreate
 _wkIOSurfaceContextCreateImage

trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp

@@ -31 +31 @@
 
 #include "CGFontUnicodeSupportSPI.h"
+#include "CoreTextSPI.h"
 #include "Font.h"
 #include "SimpleFontData.h"
@@ -84 +85 @@
             }
         }
-    } 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;

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -30 +30 @@
 #import "BlockExceptions.h"
 #import "Color.h"
+#import "CoreTextSPI.h"
 #import "FloatRect.h"
 #import "Font.h"
@@ -493 +494 @@
 
     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());

trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm

@@ -72 +72 @@
 #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);

trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

@@ -227 +227 @@
 extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
 
-extern bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
 extern BOOL (*wkUseSharedMediaUI)();
 
@@ -234 +232 @@
 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)

trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

@@ -105 +105 @@
 #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);

trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h

@@ -51 +51 @@
 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);
 
 }

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

@@ -121 +121 @@
 #endif
 
-    INIT(GetVerticalGlyphsForCharacters);
 #if PLATFORM(IOS)
     INIT(ExecutableWasLinkedOnOrAfterIOSVersion);
@@ -133 +132 @@
 #endif
 
-    INIT(CreateCTLineWithUniCharProvider);
-
 #if !PLATFORM(IOS_SIMULATOR)
     INIT(IOSurfaceContextCreate);
     INIT(IOSurfaceContextCreateImage);
 #endif
-    INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
 #if !PLATFORM(IOS)
     INIT(RecommendedScrollerStyle);

trunk/Source/WebKit/mac/WebKit.order

@@ -734 +734 @@
 __ZN20WebFrameLoaderClient38dispatchDidLoadResourceFromMemoryCacheEPN7WebCore14DocumentLoaderERKNS0_15ResourceRequestERKNS0_16ResourceResponseEi
 -[WebFrame(WebInternal) _characterRangeAtPoint:]
-_WKCreateCTTypesetterWithUniCharProviderAndOptions
 -[WebView(WebViewEditing) selectedDOMRange]
 -[WebHTMLRepresentation attributedStringFrom:startOffset:to:endOffset:]
@@ -1531 +1530 @@
 __Z4coreP14WebHistoryItem
 -[WebBackForwardList goToItem:]
-_WKCreateCTLineWithUniCharProvider
 -[WebInspector show:]
 -[WebInspector showWindow]
@@ -2314 +2312 @@
 -[WebFrame(WebPrivate) _selectedNSRange]
 -[WebFrameView _pageHorizontally:]
-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
 __ZThn8_N15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE
 __ZN15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

@@ -50 +50 @@
         INIT(CopyNSURLResponseStatusLine);
         INIT(CopyNSURLResponseCertificateChain);
-        INIT(CreateCTLineWithUniCharProvider);
 #if !PLATFORM(IOS)
         INIT(DrawBezeledTextArea);
@@ -62 +61 @@
         INIT(GetFontInLanguageForRange);
 #endif
-        INIT(GetVerticalGlyphsForCharacters);
         INIT(GetHTTPRequestPriority);
         INIT(GetNSURLResponseLastModifiedDate);
@@ -129 +127 @@
         INIT(IOSurfaceContextCreateImage);
 #endif // !PLATFORM(IOS_SIMULATOR)
-        INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
 #if !PLATFORM(IOS)
         INIT(RecommendedScrollerStyle);

trunk/Source/WebKit2/mac/WebKit2.order

@@ -945 +945 @@
 __ZNK6WebKit12WebPageProxy12canGoForwardEv
 __ZN6WebKit18WebBackForwardList11forwardItemEv
-_WKCreateCTLineWithUniCharProvider
-_WKCreateCTTypesetterWithUniCharProviderAndOptions
 _WKSetCGFontRenderingMode
 -[WKView(Private) updateLayer]
@@ -9142 +9140 @@
 __ZN6WebKit12WebPageProxy9takeFocusEj
 __ZN6WebKit11WebUIClient9takeFocusEPNS_12WebPageProxyEj
-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
 __ZN6WebKit15WebChromeClient19customHighlightRectEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectE
 __ZN6WebKit15WebChromeClient20paintCustomHighlightEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectESA_bb