Diff
Modified: trunk/Source/WebCore/ChangeLog (175959 => 175960)
--- trunk/Source/WebCore/ChangeLog 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 18:59:53 UTC (rev 175960)
@@ -1,3 +1,22 @@
+2014-11-11 Myles C. Maxfield <[email protected]>
+
+ Move CTFontTransformGlyphs out from WKSI
+ https://bugs.webkit.org/show_bug.cgi?id=138599
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * WebCore.exp.in:
+ * WebCore.order:
+ * platform/graphics/SimpleFontData.cpp:
+ (WebCore::SimpleFontData::applyTransforms):
+ * platform/graphics/SimpleFontData.h:
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/spi/cocoa/CoreTextSPI.h:
+
2014-11-11 Gyuyoung Kim <[email protected]>
Use std::unique_ptr<>|std::make_unique_ptr in RenderThemeEfl::ThemePartCacheEntry::create()
Modified: trunk/Source/WebCore/WebCore.exp.in (175959 => 175960)
--- trunk/Source/WebCore/WebCore.exp.in 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-11 18:59:53 UTC (rev 175960)
@@ -2881,7 +2881,6 @@
__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
__ZTVN7WebCore16DiskCacheMonitorE
-_wkCTFontTransformGlyphs
#endif
#if ENABLE(3D_RENDERING)
Modified: trunk/Source/WebCore/WebCore.order (175959 => 175960)
--- trunk/Source/WebCore/WebCore.order 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/WebCore.order 2014-11-11 18:59:53 UTC (rev 175960)
@@ -30591,7 +30591,6 @@
_wkCopyCONNECTProxyResponse
_wkGetVerticalGlyphsForCharacters
_wkCreateCTLineWithUniCharProvider
-_wkCTFontTransformGlyphs
_wkCreateCTTypesetterWithUniCharProviderAndOptions
_wkIOSurfaceContextCreate
_wkIOSurfaceContextCreateImage
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (175959 => 175960)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-11-11 18:59:53 UTC (rev 175960)
@@ -30,6 +30,9 @@
#include "config.h"
#include "SimpleFontData.h"
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+#include "CoreTextSPI.h"
+#endif
#include "Font.h"
#include "FontCache.h"
#include "OpenTypeMathData.h"
@@ -309,4 +312,20 @@
return platformCreateScaledFontData(fontDescription, scaleFactor);
}
+bool SimpleFontData::applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, TypesettingFeatures typesettingFeatures) const
+{
+ // We need to handle transforms on SVG fonts internally, since they are rendered internally.
+ ASSERT(!isSVGFont());
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+ CTFontTransformOptions options = (typesettingFeatures & Kerning ? kCTFontTransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? kCTFontTransformApplyShaping : 0);
+ return CTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options);
+#else
+ UNUSED_PARAM(glyphs);
+ UNUSED_PARAM(advances);
+ UNUSED_PARAM(glyphCount);
+ UNUSED_PARAM(typesettingFeatures);
+ return false;
+#endif
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (175959 => 175960)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-11-11 18:59:53 UTC (rev 175960)
@@ -216,21 +216,7 @@
bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
#endif
- bool applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, TypesettingFeatures typesettingFeatures) const
- {
- // We need to handle transforms on SVG fonts internally, since they are rendered internally.
- ASSERT(!isSVGFont());
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
- wkCTFontTransformOptions options = (typesettingFeatures & Kerning ? wkCTFontTransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? wkCTFontTransformApplyShaping : 0);
- return wkCTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options);
-#else
- UNUSED_PARAM(glyphs);
- UNUSED_PARAM(advances);
- UNUSED_PARAM(glyphCount);
- UNUSED_PARAM(typesettingFeatures);
- return false;
-#endif
- }
+ bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t glyphCount, TypesettingFeatures) const;
#if PLATFORM(WIN)
bool isSystemFont() const { return m_isSystemFont; }
Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (175959 => 175960)
--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-11 18:59:53 UTC (rev 175960)
@@ -73,7 +73,6 @@
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 bool (*wkCTFontTransformGlyphs)(CTFontRef font, CGGlyph glyphs[], CGSize advances[], CFIndex count, wkCTFontTransformOptions options);
WEBCORE_EXPORT CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (175959 => 175960)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-11-11 18:59:53 UTC (rev 175960)
@@ -236,17 +236,6 @@
extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-enum {
- wkCTFontTransformApplyShaping = (1 << 0),
- wkCTFontTransformApplyPositioning = (1 << 1)
-};
-
-typedef int wkCTFontTransformOptions;
-
-extern bool (*wkCTFontTransformGlyphs)(CTFontRef font, CGGlyph glyphs[], CGSize advances[], CFIndex count, wkCTFontTransformOptions options);
-#endif
-
extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
extern CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (175959 => 175960)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-11-11 18:59:53 UTC (rev 175960)
@@ -109,9 +109,6 @@
void* wkGetHyphenationLocationBeforeIndex;
CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-bool (*wkCTFontTransformGlyphs)(CTFontRef font, CGGlyph glyphs[], CGSize advances[], CFIndex count, wkCTFontTransformOptions options);
-#endif
CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (175959 => 175960)
--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2014-11-11 18:59:53 UTC (rev 175960)
@@ -29,17 +29,27 @@
#include <CoreText/CoreText.h>
#if USE(APPLE_INTERNAL_SDK)
+#include <CoreText/CTFontPriv.h>
#include <CoreText/CTLinePriv.h>
#endif
+extern "C" {
+
typedef const UniChar* (*CTUniCharProviderCallback)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon);
typedef void (*CTUniCharDisposeCallback)(const UniChar* chars, void* refCon);
-extern "C" {
+#if !USE(APPLE_INTERNAL_SDK)
+typedef CF_OPTIONS(uint32_t, CTFontTransformOptions)
+{
+ kCTFontTransformApplyShaping = (1 << 0),
+ kCTFontTransformApplyPositioning = (1 << 1)
+};
+#endif
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);
}
Modified: trunk/Source/WebKit/mac/ChangeLog (175959 => 175960)
--- trunk/Source/WebKit/mac/ChangeLog 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-11 18:59:53 UTC (rev 175960)
@@ -1,3 +1,14 @@
+2014-11-11 Myles C. Maxfield <[email protected]>
+
+ Move CTFontTransformGlyphs out from WKSI
+ https://bugs.webkit.org/show_bug.cgi?id=138599
+
+ Reviewed by Simon Fraser.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * WebKit.order:
+
2014-11-11 Dan Bernstein <[email protected]>
More iOS build fix.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (175959 => 175960)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-11 18:59:53 UTC (rev 175960)
@@ -54,9 +54,6 @@
#if !PLATFORM(IOS)
INIT(CGContextDrawsWithCorrectShadowOffsets);
#endif
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- INIT(CTFontTransformGlyphs);
-#endif
INIT(CopyCONNECTProxyResponse);
INIT(CopyNSURLResponseStatusLine);
INIT(CopyNSURLResponseCertificateChain);
Modified: trunk/Source/WebKit/mac/WebKit.order (175959 => 175960)
--- trunk/Source/WebKit/mac/WebKit.order 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit/mac/WebKit.order 2014-11-11 18:59:53 UTC (rev 175960)
@@ -604,7 +604,6 @@
__ZN20WebFrameLoaderClient29dispatchDidHandleOnloadEventsEv
_WKSetUpFontCache
_WKGetGlyphTransformedAdvances
-_WKCTFontTransformGlyphs
__ZN20WebFrameLoaderClient17dispatchDidLayoutEj
__ZN20WebFrameLoaderClient21dispatchDidFinishLoadEv
-[WebView(WebPrivate) _didFinishLoadForFrame:]
Modified: trunk/Source/WebKit2/ChangeLog (175959 => 175960)
--- trunk/Source/WebKit2/ChangeLog 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-11 18:59:53 UTC (rev 175960)
@@ -1,3 +1,14 @@
+2014-11-11 Myles C. Maxfield <[email protected]>
+
+ Move CTFontTransformGlyphs out from WKSI
+ https://bugs.webkit.org/show_bug.cgi?id=138599
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * mac/WebKit2.order:
+
2014-11-10 Simon Fraser <[email protected]>
Fix possible crash when closing the web inspector
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (175959 => 175960)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-11 18:59:53 UTC (rev 175960)
@@ -46,9 +46,6 @@
#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
INIT(CGContextDrawsWithCorrectShadowOffsets);
#endif
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- INIT(CTFontTransformGlyphs);
-#endif
INIT(CopyCONNECTProxyResponse);
INIT(CopyNSURLResponseStatusLine);
INIT(CopyNSURLResponseCertificateChain);
Modified: trunk/Source/WebKit2/mac/WebKit2.order (175959 => 175960)
--- trunk/Source/WebKit2/mac/WebKit2.order 2014-11-11 18:25:27 UTC (rev 175959)
+++ trunk/Source/WebKit2/mac/WebKit2.order 2014-11-11 18:59:53 UTC (rev 175960)
@@ -828,7 +828,6 @@
_WKIconDatabaseTryGetCGImageForURL
__ZN6WebKit15WebIconDatabase15imageForPageURLERKN3WTF6StringERKN7WebCore7IntSizeE
_WKGetGlyphTransformedAdvances
-_WKCTFontTransformGlyphs
_WKURLCreateWithCFURL
_WKUInt64Create
_WKContextPostMessageToInjectedBundle
