<!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>[177726] trunk/Source/WebCore</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/177726">177726</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-12-24 16:21:52 -0800 (Wed, 24 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] WebCoreSystemInterface.h declares two unused symbols
https://bugs.webkit.org/show_bug.cgi?id=139937
Reviewed by Tim Horton.
* platform/graphics/FontPlatformData.h: Removed unused typedefs.
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
FontCustomPlatformData constructor.
* platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.
(WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
parameter and m_atsContainer member variable.
* platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177725 => 177726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/ChangeLog 2014-12-25 00:21:52 UTC (rev 177726)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-24 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] WebCoreSystemInterface.h declares two unused symbols
+ https://bugs.webkit.org/show_bug.cgi?id=139937
+
+ Reviewed by Tim Horton.
+
+ * platform/graphics/FontPlatformData.h: Removed unused typedefs.
+
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
+ FontCustomPlatformData constructor.
+
+ * platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.
+ (WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
+ parameter and m_atsContainer member variable.
+
+ * platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.
+
</ins><span class="cx"> 2014-12-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify RenderStyle::invalidColor() function
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (177725 => 177726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-12-25 00:21:52 UTC (rev 177726)
</span><span class="lines">@@ -51,9 +51,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef const struct __CTFont* CTFontRef;
</span><del>-typedef UInt32 FMFont;
-typedef FMFont ATSUFontID;
-typedef UInt32 ATSFontRef;
</del><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (177725 => 177726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-12-25 00:21:52 UTC (rev 177726)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
</span><span class="cx"> {
</span><del>- ATSFontContainerRef containerRef = 0;
-
</del><span class="cx"> RetainPtr<CFDataRef> bufferData = buffer.createCFData();
</span><span class="cx"> RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(bufferData.get()));
</span><span class="cx">
</span><span class="lines">@@ -47,7 +45,7 @@
</span><span class="cx"> if (!cgFontRef)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return std::make_unique<FontCustomPlatformData>(containerRef, cgFontRef.get());
</del><ins>+ return std::make_unique<FontCustomPlatformData>(cgFontRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FontCustomPlatformData::supportsFormat(const String& format)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (177725 => 177726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2014-12-25 00:21:52 UTC (rev 177726)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> typedef struct CGFont* CGFontRef;
</span><del>-typedef UInt32 ATSFontContainerRef;
-typedef UInt32 ATSFontRef;
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -41,9 +39,8 @@
</span><span class="cx"> struct FontCustomPlatformData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
</span><span class="cx"> public:
</span><del>- FontCustomPlatformData(ATSFontContainerRef container, CGFontRef cgFont)
- : m_atsContainer(container)
- , m_cgFont(cgFont)
</del><ins>+ explicit FontCustomPlatformData(CGFontRef cgFont)
+ : m_cgFont(cgFont)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -53,7 +50,6 @@
</span><span class="cx">
</span><span class="cx"> static bool supportsFormat(const String&);
</span><span class="cx">
</span><del>- ATSFontContainerRef m_atsContainer;
</del><span class="cx"> RetainPtr<CGFontRef> m_cgFont;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (177725 => 177726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-12-25 00:21:52 UTC (rev 177726)
</span><span class="lines">@@ -59,10 +59,6 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> typedef struct _NSRange NSRange;
</span><span class="cx"> typedef double NSTimeInterval;
</span><del>-
-typedef UInt32 FMFont;
-typedef FMFont ATSUFontID;
-typedef UInt16 ATSGlyphRef;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="lines">@@ -157,7 +153,6 @@
</span><span class="cx"> extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
</span><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-extern ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
</del><span class="cx"> extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
</span><span class="cx"> #endif
</span><span class="cx"> extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
</span><span class="lines">@@ -222,8 +217,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 BOOL (*wkUseSharedMediaUI)();
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> extern void* wkGetHyphenationLocationBeforeIndex;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>