<!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>[193512] 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/193512">193512</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 23:55:41 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove CORETEXT_WEB_FONTS
https://bugs.webkit.org/show_bug.cgi?id=151891
Reviewed by Simon Fraser.
The only platform where this was turned off (Mavericks) is no longer supported.
No new tests because there is no behavior difference.
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformCreateScaledFont): Deleted.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::registeredFont):
(WebCore::FontPlatformData::ctFont):
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData): Deleted.
(WebCore::createFontCustomPlatformData): Deleted.
* platform/graphics/mac/FontCustomPlatformData.h:
(WebCore::FontCustomPlatformData::FontCustomPlatformData): Deleted.
* platform/text/TextFlags.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</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="#trunkSourceWebCoreplatformtextTextFlagsh">trunk/Source/WebCore/platform/text/TextFlags.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/ChangeLog 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-04 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove CORETEXT_WEB_FONTS
+ https://bugs.webkit.org/show_bug.cgi?id=151891
+
+ Reviewed by Simon Fraser.
+
+ The only platform where this was turned off (Mavericks) is no longer supported.
+
+ No new tests because there is no behavior difference.
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformCreateScaledFont): Deleted.
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::registeredFont):
+ (WebCore::FontPlatformData::ctFont):
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData): Deleted.
+ (WebCore::createFontCustomPlatformData): Deleted.
+ * platform/graphics/mac/FontCustomPlatformData.h:
+ (WebCore::FontCustomPlatformData::FontCustomPlatformData): Deleted.
+ * platform/text/TextFlags.h:
+
</ins><span class="cx"> 2015-12-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Garbage in page tiles when document is too long.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -283,14 +283,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Font> Font::platformCreateScaledFont(const FontDescription&, float scaleFactor) const
</span><span class="cx"> {
</span><del>-#if !CORETEXT_WEB_FONTS
- if (isCustomFont()) {
- FontPlatformData scaledFontData(m_platformData);
- scaledFontData.m_size = scaledFontData.m_size * scaleFactor;
- return Font::create(scaledFontData, true, false);
- }
-#endif
-
</del><span class="cx"> float size = m_platformData.size() * scaleFactor;
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CTFontRef FontPlatformData::registeredFont() const
</span><span class="cx"> {
</span><span class="cx"> CTFontRef platformFont = font();
</span><del>- ASSERT(!CORETEXT_WEB_FONTS || platformFont);
</del><ins>+ ASSERT(platformFont);
</ins><span class="cx"> if (platformFont && adoptCF(CTFontCopyAttribute(platformFont, kCTFontURLAttribute)))
</span><span class="cx"> return platformFont;
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -175,19 +175,13 @@
</span><span class="cx"> if (m_ctFont)
</span><span class="cx"> return m_ctFont.get();
</span><span class="cx">
</span><del>- ASSERT(m_cgFont.get());
</del><ins>+ ASSERT(m_font);
+ ASSERT(m_cgFont);
</ins><span class="cx"> m_ctFont = m_font;
</span><del>- if (m_ctFont) {
- CTFontDescriptorRef fontDescriptor;
- RetainPtr<CFStringRef> postScriptName = adoptCF(CTFontCopyPostScriptName(m_ctFont.get()));
- fontDescriptor = cascadeToLastResortFontDescriptor();
- m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_ctFont.get(), m_size, 0, fontDescriptor));
- } else {
-#if CORETEXT_WEB_FONTS
- ASSERT_NOT_REACHED();
-#endif
- m_ctFont = adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
- }
</del><ins>+ CTFontDescriptorRef fontDescriptor;
+ RetainPtr<CFStringRef> postScriptName = adoptCF(CTFontCopyPostScriptName(m_ctFont.get()));
+ fontDescriptor = cascadeToLastResortFontDescriptor();
+ m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_ctFont.get(), m_size, 0, fontDescriptor));
</ins><span class="cx">
</span><span class="cx"> if (m_widthVariant != RegularWidth) {
</span><span class="cx"> int featureTypeValue = kTextSpacingType;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -39,38 +39,20 @@
</span><span class="cx"> int size = fontDescription.computedPixelSize();
</span><span class="cx"> FontOrientation orientation = fontDescription.orientation();
</span><span class="cx"> FontWidthVariant widthVariant = fontDescription.widthVariant();
</span><del>-#if CORETEXT_WEB_FONTS
</del><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
</span><span class="cx"> font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings());
</span><span class="cx"> return FontPlatformData(font.get(), size, bold, italic, orientation, widthVariant, fontDescription.textRenderingMode());
</span><del>-#else
- UNUSED_PARAM(fontFaceFeatures);
- UNUSED_PARAM(fontFaceVariantSettings);
- return FontPlatformData(m_cgFont.get(), size, bold, italic, orientation, widthVariant, fontDescription.textRenderingMode());
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> bufferData = buffer.createCFData();
</span><span class="cx">
</span><del>-#if CORETEXT_WEB_FONTS
</del><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontManagerCreateFontDescriptorFromData(bufferData.get()));
</span><span class="cx"> if (!fontDescriptor)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return std::make_unique<FontCustomPlatformData>(fontDescriptor.get());
</span><del>-
-#else
-
- RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(bufferData.get()));
-
- RetainPtr<CGFontRef> cgFontRef = adoptCF(CGFontCreateWithDataProvider(dataProvider.get()));
- if (!cgFontRef)
- return nullptr;
-
- return std::make_unique<FontCustomPlatformData>(cgFontRef.get());
-#endif
</del><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 (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -40,13 +40,8 @@
</span><span class="cx"> struct FontCustomPlatformData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
</span><span class="cx"> public:
</span><del>-#if CORETEXT_WEB_FONTS
</del><span class="cx"> explicit FontCustomPlatformData(CTFontDescriptorRef fontDescriptor)
</span><span class="cx"> : m_fontDescriptor(fontDescriptor)
</span><del>-#else
- explicit FontCustomPlatformData(CGFontRef cgFont)
- : m_cgFont(cgFont)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,11 +51,7 @@
</span><span class="cx">
</span><span class="cx"> static bool supportsFormat(const String&);
</span><span class="cx">
</span><del>-#if CORETEXT_WEB_FONTS
</del><span class="cx"> RetainPtr<CTFontDescriptorRef> m_fontDescriptor;
</span><del>-#else
- RetainPtr<CGFontRef> m_cgFont;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextFlags.h (193511 => 193512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextFlags.h 2015-12-05 07:11:16 UTC (rev 193511)
+++ trunk/Source/WebCore/platform/text/TextFlags.h 2015-12-05 07:55:41 UTC (rev 193512)
</span><span class="lines">@@ -26,15 +26,6 @@
</span><span class="cx"> #ifndef TextFlags_h
</span><span class="cx"> #define TextFlags_h
</span><span class="cx">
</span><del>-// <rdar://problem/16980736>: Web fonts crash on certain OSes when using CTFontManagerCreateFontDescriptorFromData()
-// FIXME: When we have moved entirely to CORETEXT_WEB_FONTS, remove the isCustomFont member variable from Font, since it will no longer be used.
-// See https://bug-145873-attachments.webkit.org/attachment.cgi?id=254710
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-#define CORETEXT_WEB_FONTS 0
-#else
-#define CORETEXT_WEB_FONTS 1
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> enum TextRenderingMode { AutoTextRendering, OptimizeSpeed, OptimizeLegibility, GeometricPrecision };
</span></span></pre>
</div>
</div>
</body>
</html>