<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175972] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175972">175972</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 13:37:03 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp">trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebKitorder">trunk/Source/WebKit/mac/WebKit.order</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2macWebKit2order">trunk/Source/WebKit2/mac/WebKit2.order</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Unreviewed Mountain Lion build fix
</span><span class="cx">
</span><span class="cx"> * platform/spi/cocoa/CoreTextSPI.h:
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -2156,8 +2156,6 @@
</span><span class="cx"> _wkCopyNSURLResponseCertificateChain
</span><span class="cx"> _wkCopyNSURLResponseStatusLine
</span><span class="cx"> _wkCopyRequestWithStorageSession
</span><del>-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
</del><span class="cx"> _wkCreatePrivateStorageSession
</span><span class="cx"> _wkDeleteAllHTTPCookies
</span><span class="cx"> _wkDeleteHTTPCookie
</span><span class="lines">@@ -2451,7 +2449,6 @@
</span><span class="cx"> _wkGetNSEventKeyChar
</span><span class="cx"> _wkGetNSURLResponseCalculatedExpiration
</span><span class="cx"> _wkGetNSURLResponseMustRevalidate
</span><del>-_wkGetVerticalGlyphsForCharacters
</del><span class="cx"> _wkGetWheelEventDeltas
</span><span class="cx"> _wkHitTestMediaUIPart
</span><span class="cx"> _wkMeasureMediaUIPart
</span><span class="lines">@@ -2863,7 +2860,6 @@
</span><span class="cx"> _wkGetScreenSize
</span><span class="cx"> _wkGetUserAgent
</span><span class="cx"> _wkGetVendorNameForNavigator
</span><del>-_wkGetVerticalGlyphsForCharacters
</del><span class="cx"> _wkIsGB18030ComplianceRequired
</span><span class="cx"> _wkIsOptimizedFullscreenSupported
</span><span class="cx"> _wkSetLayerContentsScale
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/WebCore.order 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -30589,9 +30589,6 @@
</span><span class="cx"> _wkSetCONNECTProxyForStream
</span><span class="cx"> _wkSetCONNECTProxyAuthorizationForStream
</span><span class="cx"> _wkCopyCONNECTProxyResponse
</span><del>-_wkGetVerticalGlyphsForCharacters
-_wkCreateCTLineWithUniCharProvider
-_wkCreateCTTypesetterWithUniCharProviderAndOptions
</del><span class="cx"> _wkIOSurfaceContextCreate
</span><span class="cx"> _wkIOSurfaceContextCreateImage
</span><span class="cx"> _wkRecommendedScrollerStyle
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "GlyphPageTreeNode.h"
</span><span class="cx">
</span><span class="cx"> #include "CGFontUnicodeSupportSPI.h"
</span><ins>+#include "CoreTextSPI.h"
</ins><span class="cx"> #include "Font.h"
</span><span class="cx"> #include "SimpleFontData.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="lines">@@ -83,9 +84,9 @@
</span><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
</del><ins>+ } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? CTFontGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
</ins><span class="cx"> : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
</span><del>- // When buffer consists of surrogate pairs, wkGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
</del><ins>+ // When buffer consists of surrogate pairs, CTFontGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
</ins><span class="cx"> // place the glyphs at indices corresponding to the first character of each pair.
</span><span class="cx"> unsigned glyphStep = bufferLength / length;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "Color.h"
</span><ins>+#import "CoreTextSPI.h"
</ins><span class="cx"> #import "FloatRect.h"
</span><span class="cx"> #import "Font.h"
</span><span class="cx"> #import "FontCache.h"
</span><span class="lines">@@ -492,7 +493,7 @@
</span><span class="cx"> RetainPtr<CGFontRef> cgFont = adoptCF(CTFontCopyGraphicsFont(platformData().ctFont(), 0));
</span><span class="cx">
</span><span class="cx"> ProviderInfo info = { characters, length, getCFStringAttributes(0, platformData().orientation()) };
</span><del>- RetainPtr<CTLineRef> line = adoptCF(wkCreateCTLineWithUniCharProvider(&provideStringAndAttributes, 0, &info));
</del><ins>+ RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info));
</ins><span class="cx">
</span><span class="cx"> CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
</span><span class="cx"> CFIndex runCount = CFArrayGetCount(runArray);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -71,11 +71,6 @@
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-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);
-
</del><span class="cx"> #if !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> WEBCORE_EXPORT CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span class="cx"> WEBCORE_EXPORT CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -226,18 +226,12 @@
</span><span class="cx"> extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span class="cx"> extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx">
</span><del>-extern bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
</del><span class="cx"> extern BOOL (*wkUseSharedMediaUI)();
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> extern void* wkGetHyphenationLocationBeforeIndex;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-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);
-
</del><span class="cx"> #if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span class="cx"> extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -104,14 +104,8 @@
</span><span class="cx"> void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
</del><span class="cx"> void* wkGetHyphenationLocationBeforeIndex;
</span><span class="cx">
</span><del>-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);
-
</del><span class="cx"> CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span class="cx"> CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon);
</span><span class="cx"> CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon, CFDictionaryRef options);
</span><span class="cx"> bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);
</span><ins>+bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-11-11 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Localize strings for action menus
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -120,7 +120,6 @@
</span><span class="cx"> INIT(QTClearMediaDownloadCache);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- INIT(GetVerticalGlyphsForCharacters);
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> INIT(ExecutableWasLinkedOnOrAfterIOSVersion);
</span><span class="cx"> INIT(GetDeviceClass);
</span><span class="lines">@@ -132,13 +131,10 @@
</span><span class="cx"> INIT(GetMediaUIImageData);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- INIT(CreateCTLineWithUniCharProvider);
-
</del><span class="cx"> #if !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> INIT(IOSurfaceContextCreate);
</span><span class="cx"> INIT(IOSurfaceContextCreateImage);
</span><span class="cx"> #endif
</span><del>- INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(RecommendedScrollerStyle);
</span><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKit.order (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKit.order 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit/mac/WebKit.order 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -733,7 +733,6 @@
</span><span class="cx"> _WKGetCFURLResponseMIMEType
</span><span class="cx"> __ZN20WebFrameLoaderClient38dispatchDidLoadResourceFromMemoryCacheEPN7WebCore14DocumentLoaderERKNS0_15ResourceRequestERKNS0_16ResourceResponseEi
</span><span class="cx"> -[WebFrame(WebInternal) _characterRangeAtPoint:]
</span><del>-_WKCreateCTTypesetterWithUniCharProviderAndOptions
</del><span class="cx"> -[WebView(WebViewEditing) selectedDOMRange]
</span><span class="cx"> -[WebHTMLRepresentation attributedStringFrom:startOffset:to:endOffset:]
</span><span class="cx"> -[WebHTMLView shouldDelayWindowOrderingForEvent:]
</span><span class="lines">@@ -1530,7 +1529,6 @@
</span><span class="cx"> -[WebBackForwardList addItem:]
</span><span class="cx"> __Z4coreP14WebHistoryItem
</span><span class="cx"> -[WebBackForwardList goToItem:]
</span><del>-_WKCreateCTLineWithUniCharProvider
</del><span class="cx"> -[WebInspector show:]
</span><span class="cx"> -[WebInspector showWindow]
</span><span class="cx"> __ZN18WebInspectorClient21openInspectorFrontendEPN7WebCore19InspectorControllerE
</span><span class="lines">@@ -2313,8 +2311,6 @@
</span><span class="cx"> -[WebHTMLView(WebNSTextInputSupport) selectedRange]
</span><span class="cx"> -[WebFrame(WebPrivate) _selectedNSRange]
</span><span class="cx"> -[WebFrameView _pageHorizontally:]
</span><del>-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
</del><span class="cx"> __ZThn8_N15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZN15WebEditorClient17getGuessesForWordERKN3WTF6StringES3_RNS0_6VectorIS1_Lm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZN3WTF6VectorINS_6StringELm0ENS_15CrashOnOverflowEE14shrinkCapacityEm
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-11-11 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a respondsToSelector check to dismissActionMenuPopovers
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> INIT(CopyCONNECTProxyResponse);
</span><span class="cx"> INIT(CopyNSURLResponseStatusLine);
</span><span class="cx"> INIT(CopyNSURLResponseCertificateChain);
</span><del>- INIT(CreateCTLineWithUniCharProvider);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(DrawBezeledTextArea);
</span><span class="cx"> INIT(DrawCapsLockIndicator);
</span><span class="lines">@@ -61,7 +60,6 @@
</span><span class="cx"> INIT(GetFontInLanguageForCharacter);
</span><span class="cx"> INIT(GetFontInLanguageForRange);
</span><span class="cx"> #endif
</span><del>- INIT(GetVerticalGlyphsForCharacters);
</del><span class="cx"> INIT(GetHTTPRequestPriority);
</span><span class="cx"> INIT(GetNSURLResponseLastModifiedDate);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -128,7 +126,6 @@
</span><span class="cx"> INIT(IOSurfaceContextCreate);
</span><span class="cx"> INIT(IOSurfaceContextCreateImage);
</span><span class="cx"> #endif // !PLATFORM(IOS_SIMULATOR)
</span><del>- INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(RecommendedScrollerStyle);
</span><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
</span></span></pre></div>
<a id="trunkSourceWebKit2macWebKit2order"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/WebKit2.order (175971 => 175972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/WebKit2.order 2014-11-11 21:21:45 UTC (rev 175971)
+++ trunk/Source/WebKit2/mac/WebKit2.order 2014-11-11 21:37:03 UTC (rev 175972)
</span><span class="lines">@@ -944,8 +944,6 @@
</span><span class="cx"> _WKPageCanGoForward
</span><span class="cx"> __ZNK6WebKit12WebPageProxy12canGoForwardEv
</span><span class="cx"> __ZN6WebKit18WebBackForwardList11forwardItemEv
</span><del>-_WKCreateCTLineWithUniCharProvider
-_WKCreateCTTypesetterWithUniCharProviderAndOptions
</del><span class="cx"> _WKSetCGFontRenderingMode
</span><span class="cx"> -[WKView(Private) updateLayer]
</span><span class="cx"> -[WKView drawsBackground]
</span><span class="lines">@@ -9141,8 +9139,6 @@
</span><span class="cx"> __ZN7CoreIPC13MessageSender4sendIN8Messages12WebPageProxy9TakeFocusEEEbRKT_y
</span><span class="cx"> __ZN6WebKit12WebPageProxy9takeFocusEj
</span><span class="cx"> __ZN6WebKit11WebUIClient9takeFocusEPNS_12WebPageProxyEj
</span><del>-_WKGetVerticalGlyphsForCharacters
-_CTFontGetVerticalGlyphsForCharacters
</del><span class="cx"> __ZN6WebKit15WebChromeClient19customHighlightRectEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectE
</span><span class="cx"> __ZN6WebKit15WebChromeClient20paintCustomHighlightEPN7WebCore4NodeERKN3WTF12AtomicStringERKNS1_9FloatRectESA_bb
</span><span class="cx"> _WKBundlePageFindString
</span></span></pre>
</div>
</div>
</body>
</html>