<!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>[188575] 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/188575">188575</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 21:55:22 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Address post-commit review
https://bugs.webkit.org/show_bug.cgi?id=147864
Reviewed by Darin Adler.
Create helper functions to cast between NSFont*s and CTFontRefs.
No new tests because there is no behavior change.
* platform/graphics/FontPlatformData.h:
(WebCore::toCTFont):
(WebCore::toNSFont):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformCreateScaledFont):
(WebCore::Font::compositeFontReferenceFont):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::FontCache::platformPurgeInactiveFontData):
(WebCore::lookupCTFont):
(WebCore::FontCache::systemFallbackForCharacters):
(WebCore::FontCache::createFontPlatformData):
* platform/mac/DragImageMac.mm:
(WebCore::fontFromNSFont):
(WebCore::widthWithFont):
(WebCore::drawAtPoint):
* platform/spi/mac/NSFontSPI.h:</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="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSFontSPIh">trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/ChangeLog 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-08-17 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Address post-commit review
+ https://bugs.webkit.org/show_bug.cgi?id=147864
+
+ Reviewed by Darin Adler.
+
+ Create helper functions to cast between NSFont*s and CTFontRefs.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::toCTFont):
+ (WebCore::toNSFont):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformCreateScaledFont):
+ (WebCore::Font::compositeFontReferenceFont):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::FontCache::platformPurgeInactiveFontData):
+ (WebCore::lookupCTFont):
+ (WebCore::FontCache::systemFallbackForCharacters):
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/mac/DragImageMac.mm:
+ (WebCore::fontFromNSFont):
+ (WebCore::widthWithFont):
+ (WebCore::drawAtPoint):
+ * platform/spi/mac/NSFontSPI.h:
+
</ins><span class="cx"> 2015-08-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> WinCairo build fix after r188566
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -244,6 +244,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if USE(APPKIT)
+// NSFonts and CTFontRefs are toll-free-bridged.
+inline CTFontRef toCTFont(NSFont *font)
+{
+ return (CTFontRef)font;
+}
+
+inline NSFont *toNSFont(CTFontRef font)
+{
+ return (NSFont *)font;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FontPlatformData_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><del>- FontPlatformData scaledFontData(reinterpret_cast<CTFontRef>([[NSFontManager sharedFontManager] convertFont:m_platformData.nsFont() toSize:size]), size, false, false, m_platformData.orientation());
</del><ins>+ FontPlatformData scaledFontData(toCTFont([[NSFontManager sharedFontManager] convertFont:m_platformData.nsFont() toSize:size]), size, false, false, m_platformData.orientation());
</ins><span class="cx">
</span><span class="cx"> if (scaledFontData.font()) {
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -474,10 +474,10 @@
</span><span class="cx">
</span><span class="cx"> void FontCache::platformPurgeInactiveFontData()
</span><span class="cx"> {
</span><del>- Vector<RetainPtr<CTFontRef>> toRemove;
</del><ins>+ Vector<CTFontRef> toRemove;
</ins><span class="cx"> for (auto& font : fallbackDedupSet()) {
</span><span class="cx"> if (CFGetRetainCount(font.get()) == 1)
</span><del>- toRemove.append(font);
</del><ins>+ toRemove.append(font.get());
</ins><span class="cx"> }
</span><span class="cx"> for (auto& font : toRemove)
</span><span class="cx"> fallbackDedupSet().remove(font);
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
</span><span class="cx"> UNUSED_PARAM(locale);
</span><span class="cx"> if (!font) {
</span><del>- font = reinterpret_cast<CTFontRef>([NSFont userFontOfSize:fontSize]);
</del><ins>+ font = toCTFont([NSFont userFontOfSize:fontSize]);
</ins><span class="cx"> bool acceptable = true;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFCharacterSetRef> characterSet = adoptCF(CTFontCopyCharacterSet(font));
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> // FontCascade::drawGlyphBuffer() requires that there are no duplicate Font objects which refer to the same thing. This is enforced in
</span><span class="cx"> // FontCache::fontForPlatformData(), where our equality check is based on hashing the FontPlatformData, whose hash includes the raw CoreText
</span><span class="cx"> // font pointer.
</span><del>- NSFont *substituteFont = reinterpret_cast<NSFont *>(const_cast<__CTFont*>(fallbackDedupSet().add(result).iterator->get()));
</del><ins>+ NSFont *substituteFont = toNSFont(fallbackDedupSet().add(result).iterator->get());
</ins><span class="cx">
</span><span class="cx"> // Use the family name from the AppKit-supplied substitute font, requesting the
</span><span class="cx"> // traits, weight, and size we want. One way this does better than the original
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> substituteFontTraits = [fontManager traitsOfFont:substituteFont];
</span><span class="cx"> substituteFontWeight = [fontManager weightOfFont:substituteFont];
</span><span class="cx">
</span><del>- FontPlatformData alternateFont(reinterpret_cast<CTFontRef>(substituteFont), platformData.size(),
</del><ins>+ FontPlatformData alternateFont(toCTFont(substituteFont), platformData.size(),
</ins><span class="cx"> !isPlatformFont && isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(substituteFontWeight),
</span><span class="cx"> !isPlatformFont && (traits & NSFontItalicTrait) && !(substituteFontTraits & NSFontItalicTrait),
</span><span class="cx"> platformData.m_orientation);
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx"> bool syntheticBold = (fontDescription.fontSynthesis() & FontSynthesisWeight) && isAppKitFontWeightBold(toAppKitFontWeight(fontDescription.weight())) && !isAppKitFontWeightBold(actualWeight);
</span><span class="cx"> bool syntheticOblique = (fontDescription.fontSynthesis() & FontSynthesisStyle) && (traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
</span><span class="cx">
</span><del>- return std::make_unique<FontPlatformData>(reinterpret_cast<CTFontRef>(platformFont), size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</del><ins>+ return std::make_unique<FontPlatformData>(toCTFont(platformFont), size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> CFRelease(currentFont);
</span><span class="cx"> currentFont = font;
</span><span class="cx"> CFRetain(currentFont);
</span><del>- currentRenderer = FontCascade(FontPlatformData(reinterpret_cast<CTFontRef>(font), [font pointSize]));
</del><ins>+ currentRenderer = FontCascade(FontPlatformData(toCTFont(font), [font pointSize]));
</ins><span class="cx"> return currentRenderer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> [string getCharacters:buffer.data()];
</span><span class="cx">
</span><span class="cx"> if (canUseFastRenderer(buffer.data(), length)) {
</span><del>- FontCascade webCoreFont(FontPlatformData(reinterpret_cast<CTFontRef>(font), [font pointSize]));
</del><ins>+ FontCascade webCoreFont(FontPlatformData(toCTFont(font), [font pointSize]));
</ins><span class="cx"> TextRun run(StringView(buffer.data(), length));
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx"> return webCoreFont.width(run);
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> if (!flipped)
</span><span class="cx"> CGContextScaleCTM(cgContext, 1, -1);
</span><span class="cx">
</span><del>- FontCascade webCoreFont(FontPlatformData(reinterpret_cast<CTFontRef>(font), [font pointSize]), Antialiased);
</del><ins>+ FontCascade webCoreFont(FontPlatformData(toCTFont(font), [font pointSize]), Antialiased);
</ins><span class="cx"> TextRun run(StringView(buffer.data(), length));
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSFontSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h (188574 => 188575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-08-18 04:13:57 UTC (rev 188574)
+++ trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-08-18 04:55:22 UTC (rev 188575)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-@interface NSFont (Private)
</del><ins>+@interface NSFont ()
</ins><span class="cx"> + (NSFont *)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>