<!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>[174052] 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/174052">174052</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-09-28 20:42:38 -0700 (Sun, 28 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace wkGetGlyphsForCharacters() with CGFontGetGlyphsForUnichars()
https://bugs.webkit.org/show_bug.cgi?id=137197
Reviewed by Alexey Proskuryakov.
No new tests because there is no behavior change.
Source/WebCore:
* WebCore.exp.in:
* WebCore.order:
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
(WebCore::GlyphPage::fill): Use SPI call instead of WKSI call
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/spi/cocoa/CGFontUnicodeSupport.h: Added for SPI call.
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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp">trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp</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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicocoaCGFontUnicodeSupportSPIh">trunk/Source/WebCore/platform/spi/cocoa/CGFontUnicodeSupportSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/ChangeLog 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Replace wkGetGlyphsForCharacters() with CGFontGetGlyphsForUnichars()
+ https://bugs.webkit.org/show_bug.cgi?id=137197
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests because there is no behavior change.
+
+ * WebCore.exp.in:
+ * WebCore.order:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+ (WebCore::GlyphPage::fill): Use SPI call instead of WKSI call
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/spi/cocoa/CGFontUnicodeSupport.h: Added for SPI call.
+
</ins><span class="cx"> 2014-09-28 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Automatically generate template specializations for most Elements
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -2384,7 +2384,6 @@
</span><span class="cx"> _wkGetBytesFromAXTextMarker
</span><span class="cx"> _wkGetFontInLanguageForCharacter
</span><span class="cx"> _wkGetFontInLanguageForRange
</span><del>-_wkGetGlyphsForCharacters
</del><span class="cx"> _wkGetHyphenationLocationBeforeIndex
</span><span class="cx"> _wkGetNSEventKeyChar
</span><span class="cx"> _wkGetNSURLResponseCalculatedExpiration
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/WebCore.order 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -30627,7 +30627,6 @@
</span><span class="cx"> _wkSetCONNECTProxyForStream
</span><span class="cx"> _wkSetCONNECTProxyAuthorizationForStream
</span><span class="cx"> _wkCopyCONNECTProxyResponse
</span><del>-_wkGetGlyphsForCharacters
</del><span class="cx"> _wkGetVerticalGlyphsForCharacters
</span><span class="cx"> _wkCreateCTLineWithUniCharProvider
</span><span class="cx"> _wkCTFontTransformGlyphs
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -960,6 +960,7 @@
</span><span class="cx"> 1CF6BDFB0E9BB26A0025E1CD /* ObjCEventListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6BDF90E9BB26A0025E1CD /* ObjCEventListener.mm */; };
</span><span class="cx"> 1CF6BE140E9BB4670025E1CD /* ObjCNodeFilterCondition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6BE120E9BB4670025E1CD /* ObjCNodeFilterCondition.mm */; };
</span><span class="cx"> 1CF6BE150E9BB4670025E1CD /* ObjCNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CF6BE130E9BB4670025E1CD /* ObjCNodeFilterCondition.h */; };
</span><ins>+ 1CF7E26F19D8839800DD8F98 /* CGFontUnicodeSupportSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CF7E26E19D881EF00DD8F98 /* CGFontUnicodeSupportSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1CFAE3230A6D6A3F0032593D /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */; };
</span><span class="cx"> 1F3C3BEA135CAF3C00B8C1AC /* MediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F3C3BE8135CAF3C00B8C1AC /* MediaControls.cpp */; };
</span><span class="cx"> 1F3C3BEB135CAF3C00B8C1AC /* MediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F3C3BE9135CAF3C00B8C1AC /* MediaControls.h */; };
</span><span class="lines">@@ -7922,6 +7923,7 @@
</span><span class="cx"> 1CF6BDF90E9BB26A0025E1CD /* ObjCEventListener.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCEventListener.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1CF6BE120E9BB4670025E1CD /* ObjCNodeFilterCondition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCNodeFilterCondition.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1CF6BE130E9BB4670025E1CD /* ObjCNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCNodeFilterCondition.h; sourceTree = "<group>"; };
</span><ins>+ 1CF7E26E19D881EF00DD8F98 /* CGFontUnicodeSupportSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CGFontUnicodeSupportSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
</span><span class="cx"> 1F3C3BE8135CAF3C00B8C1AC /* MediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControls.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1F3C3BE9135CAF3C00B8C1AC /* MediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControls.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16178,6 +16180,7 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
</span><ins>+ 1CF7E26E19D881EF00DD8F98 /* CGFontUnicodeSupportSPI.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -23671,6 +23674,7 @@
</span><span class="cx"> FE456F191677D74E005EDDF9 /* DatabaseManager.h in Headers */,
</span><span class="cx"> 97BC6A331505F081001B74AC /* DatabaseManagerClient.h in Headers */,
</span><span class="cx"> FEAF6654167970320062D0C5 /* DatabaseServer.h in Headers */,
</span><ins>+ 1CF7E26F19D8839800DD8F98 /* CGFontUnicodeSupportSPI.h in Headers */,
</ins><span class="cx"> FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */,
</span><span class="cx"> 97BC6A2B1505F081001B74AC /* DatabaseSync.h in Headers */,
</span><span class="cx"> 97BC6A2E1505F081001B74AC /* DatabaseTask.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GlyphPageTreeNode.h"
</span><span class="cx">
</span><ins>+#include "CGFontUnicodeSupportSPI.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">@@ -69,16 +70,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<CGGlyph, 512> glyphs(bufferLength);
</span><span class="cx"> if (!shouldUseCoreText(buffer, bufferLength, fontData)) {
</span><del>-#if !PLATFORM(IOS)
- wkGetGlyphsForCharacters(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
-#else
</del><span class="cx"> // We pass in either 256 or 512 UTF-16 characters: 256 for U+FFFF and less, 512 (double character surrogates)
</span><span class="cx"> // for U+10000 and above. It is indeed possible to get back 512 glyphs back from the API, so the glyph buffer
</span><span class="cx"> // we pass in must be 512. If we get back more than 256 glyphs though we'll ignore all the ones after 256,
</span><span class="cx"> // this should not happen as the only time we pass in 512 characters is when they are surrogates.
</span><del>- // FIXME: Use wkGetGlyphsForCharacters() instead of CGFontGetGlyphsForUnichars() once we update WebKit System Interface on iOS.
</del><span class="cx"> CGFontGetGlyphsForUnichars(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
</span><del>-#endif
</del><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (!glyphs[i])
</span><span class="cx"> setGlyphDataForIndex(offset + i, 0, 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -225,7 +225,6 @@
</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 void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
</del><span class="cx"> extern bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
</span><span class="cx">
</span><span class="cx"> extern BOOL (*wkUseSharedMediaUI)();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx"> void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
</del><span class="cx"> bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
</span><span class="cx">
</span><span class="cx"> void* wkGetHyphenationLocationBeforeIndex;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCGFontUnicodeSupportSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/CGFontUnicodeSupportSPI.h (0 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CGFontUnicodeSupportSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/CGFontUnicodeSupportSPI.h 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CGFontUnicodeSupportSPI_h
+#define CGFontUnicodeSupportSPI_h
+
+#include <CoreGraphics/CoreGraphics.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFontUnicodeSupport.h>
+#endif
+
+extern "C" void CGFontGetGlyphsForUnichars(CGFontRef font, const UniChar u[], CGGlyph glyphs[], size_t count);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit/ChangeLog 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Replace wkGetGlyphsForCharacters() with CGFontGetGlyphsForUnichars()
+ https://bugs.webkit.org/show_bug.cgi?id=137197
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests because there is no behavior change.
+
+ * mac/WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * WebKit.order:
+
</ins><span class="cx"> 2014-09-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] 64-bit build fix after r173929.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -123,9 +123,6 @@
</span><span class="cx"> INIT(QTClearMediaDownloadCache);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- INIT(GetGlyphsForCharacters);
-#endif
</del><span class="cx"> INIT(GetVerticalGlyphsForCharacters);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> INIT(ExecutableWasLinkedOnOrAfterIOSVersion);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKit.order (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKit.order 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit/mac/WebKit.order 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -603,7 +603,6 @@
</span><span class="cx"> __ZN20WebFrameLoaderClient29dispatchDidFinishDocumentLoadEv
</span><span class="cx"> __ZN20WebFrameLoaderClient29dispatchDidHandleOnloadEventsEv
</span><span class="cx"> _WKSetUpFontCache
</span><del>-_WKGetGlyphsForCharacters
</del><span class="cx"> _WKGetGlyphTransformedAdvances
</span><span class="cx"> _WKCTFontTransformGlyphs
</span><span class="cx"> __ZN20WebFrameLoaderClient17dispatchDidLayoutEj
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Replace wkGetGlyphsForCharacters() with CGFontGetGlyphsForUnichars()
+ https://bugs.webkit.org/show_bug.cgi?id=137197
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests because there is no behavior change.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * mac/WebKit2.order:
+
</ins><span class="cx"> 2014-09-28 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr for ContextMenuController
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> INIT(DrawMediaUIPart);
</span><span class="cx"> INIT(GetFontInLanguageForCharacter);
</span><span class="cx"> INIT(GetFontInLanguageForRange);
</span><del>- INIT(GetGlyphsForCharacters);
</del><span class="cx"> #endif
</span><span class="cx"> INIT(GetVerticalGlyphsForCharacters);
</span><span class="cx"> INIT(GetHTTPRequestPriority);
</span></span></pre></div>
<a id="trunkSourceWebKit2macWebKit2order"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/WebKit2.order (174051 => 174052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/WebKit2.order 2014-09-29 03:02:01 UTC (rev 174051)
+++ trunk/Source/WebKit2/mac/WebKit2.order 2014-09-29 03:42:38 UTC (rev 174052)
</span><span class="lines">@@ -827,7 +827,6 @@
</span><span class="cx"> __ZN6WebKit6WebURLD0Ev
</span><span class="cx"> _WKIconDatabaseTryGetCGImageForURL
</span><span class="cx"> __ZN6WebKit15WebIconDatabase15imageForPageURLERKN3WTF6StringERKN7WebCore7IntSizeE
</span><del>-_WKGetGlyphsForCharacters
</del><span class="cx"> _WKGetGlyphTransformedAdvances
</span><span class="cx"> _WKCTFontTransformGlyphs
</span><span class="cx"> _WKURLCreateWithCFURL
</span></span></pre>
</div>
</div>
</body>
</html>