<!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>[200094] 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/200094">200094</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-04-26 10:20:29 -0700 (Tue, 26 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make FontPlatformData immutable
https://bugs.webkit.org/show_bug.cgi?id=157024
Reviewed by Darin Adler.
This patch deletes all functions which modify a FontPlatformData once
it has been created. This makes for a cleaner design.
No new tests because there is no behavior change.
* platform/graphics/Font.cpp:
(WebCore::Font::verticalRightOrientationFont):
(WebCore::Font::nonSyntheticItalicFont):
* platform/graphics/FontPlatformData.cpp:
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::cloneWithOrientation):
(WebCore::FontPlatformData::cloneWithSyntheticOblique):
* platform/graphics/FontPlatformData.h:
(WebCore::FontPlatformData::setIsSystemFont): Deleted.
(WebCore::FontPlatformData::setSize): Deleted.
(WebCore::FontPlatformData::setOrientation): Deleted.
(WebCore::FontPlatformData::setSyntheticOblique): Deleted.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::systemFallbackForCharacters):
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawGlyphs):
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformInit):
(WebCore::Font::platformCharWidthInit):
(WebCore::createDerivativeFont):
(WebCore::Font::createFontWithoutSynthesizableFeatures):
(WebCore::Font::platformCreateScaledFont):
(WebCore::Font::platformWidthForGlyph):
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::openTypeTable):
* platform/graphics/win/FontPlatformDataCairoWin.cpp:
(WebCore::FontPlatformData::platformDataInit):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</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="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDatah">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataCairoWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/ChangeLog 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-04-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Make FontPlatformData immutable
+ https://bugs.webkit.org/show_bug.cgi?id=157024
+
+ Reviewed by Darin Adler.
+
+ This patch deletes all functions which modify a FontPlatformData once
+ it has been created. This makes for a cleaner design.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::verticalRightOrientationFont):
+ (WebCore::Font::nonSyntheticItalicFont):
+ * platform/graphics/FontPlatformData.cpp:
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::cloneWithOrientation):
+ (WebCore::FontPlatformData::cloneWithSyntheticOblique):
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::FontPlatformData::setIsSystemFont): Deleted.
+ (WebCore::FontPlatformData::setSize): Deleted.
+ (WebCore::FontPlatformData::setOrientation): Deleted.
+ (WebCore::FontPlatformData::setSyntheticOblique): Deleted.
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::drawGlyphs):
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformInit):
+ (WebCore::Font::platformCharWidthInit):
+ (WebCore::createDerivativeFont):
+ (WebCore::Font::createFontWithoutSynthesizableFeatures):
+ (WebCore::Font::platformCreateScaledFont):
+ (WebCore::Font::platformWidthForGlyph):
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::openTypeTable):
+ * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+ (WebCore::FontPlatformData::platformDataInit):
+
</ins><span class="cx"> 2016-04-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200089.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -253,8 +253,7 @@
</span><span class="cx"> if (!m_derivedFontData)
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->verticalRightOrientation) {
</span><del>- FontPlatformData verticalRightPlatformData(m_platformData);
- verticalRightPlatformData.setOrientation(Horizontal);
</del><ins>+ auto verticalRightPlatformData = FontPlatformData::cloneWithOrientation(m_platformData, Horizontal);
</ins><span class="cx"> m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont(), false, true);
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_derivedFontData->verticalRightOrientation != this);
</span><span class="lines">@@ -320,9 +319,10 @@
</span><span class="cx"> if (!m_derivedFontData)
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->nonSyntheticItalic) {
</span><ins>+#if PLATFORM(COCOA) || USE(CAIRO)
+ FontPlatformData nonSyntheticItalicFontPlatformData = FontPlatformData::cloneWithSyntheticOblique(m_platformData, false);
+#else
</ins><span class="cx"> FontPlatformData nonSyntheticItalicFontPlatformData(m_platformData);
</span><del>-#if PLATFORM(COCOA) || USE(CAIRO)
- nonSyntheticItalicFontPlatformData.setSyntheticOblique(false);
</del><span class="cx"> #endif
</span><span class="cx"> m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
</span><del>- : m_syntheticBold(syntheticBold)
- , m_syntheticOblique(syntheticOblique)
</del><ins>+ : m_size(size)
</ins><span class="cx"> , m_orientation(orientation)
</span><del>- , m_size(size)
</del><span class="cx"> , m_widthVariant(widthVariant)
</span><span class="cx"> , m_textRenderingMode(textRenderingMode)
</span><ins>+ , m_syntheticBold(syntheticBold)
+ , m_syntheticOblique(syntheticOblique)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,6 +71,27 @@
</span><span class="cx"> platformDataInit(source);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FontPlatformData FontPlatformData::cloneWithOrientation(const FontPlatformData& source, FontOrientation orientation)
+{
+ FontPlatformData copy(source);
+ copy.m_orientation = orientation;
+ return copy;
+}
+
+FontPlatformData FontPlatformData::cloneWithSyntheticOblique(const FontPlatformData& source, bool syntheticOblique)
+{
+ FontPlatformData copy(source);
+ copy.m_syntheticOblique = syntheticOblique;
+ return copy;
+}
+
+FontPlatformData FontPlatformData::cloneWithSize(const FontPlatformData& source, float size)
+{
+ FontPlatformData copy(source);
+ copy.m_size = size;
+ return copy;
+}
+
</ins><span class="cx"> const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
</span><span class="cx"> {
</span><span class="cx"> // Check for self-assignment.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> class FontDescription;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><ins>+// This class is conceptually immutable. Once created, no instances should ever change (in an observable way).
</ins><span class="cx"> class FontPlatformData {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -87,6 +88,10 @@
</span><span class="cx"> WEBCORE_EXPORT FontPlatformData(CTFontRef, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, TextRenderingMode = AutoTextRendering);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static FontPlatformData cloneWithOrientation(const FontPlatformData&, FontOrientation);
+ static FontPlatformData cloneWithSyntheticOblique(const FontPlatformData&, bool);
+ static FontPlatformData cloneWithSize(const FontPlatformData&, float);
+
</ins><span class="cx"> #if USE(CG)
</span><span class="cx"> FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant, TextRenderingMode);
</span><span class="cx"> #endif
</span><span class="lines">@@ -124,7 +129,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) || PLATFORM(COCOA)
</span><span class="cx"> bool isSystemFont() const { return m_isSystemFont; }
</span><del>- void setIsSystemFont(bool isSystemFont) { m_isSystemFont = isSystemFont; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -133,7 +137,6 @@
</span><span class="cx">
</span><span class="cx"> bool isFixedPitch() const;
</span><span class="cx"> float size() const { return m_size; }
</span><del>- void setSize(float size) { m_size = size; }
</del><span class="cx"> bool syntheticBold() const { return m_syntheticBold; }
</span><span class="cx"> bool syntheticOblique() const { return m_syntheticOblique; }
</span><span class="cx"> bool isColorBitmapFont() const { return m_isColorBitmapFont; }
</span><span class="lines">@@ -142,9 +145,6 @@
</span><span class="cx"> TextRenderingMode textRenderingMode() const { return m_textRenderingMode; }
</span><span class="cx"> bool isForTextCombine() const { return widthVariant() != RegularWidth; } // Keep in sync with callers of FontDescription::setWidthVariant().
</span><span class="cx">
</span><del>- void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
- void setSyntheticOblique(bool syntheticOblique) { m_syntheticOblique = syntheticOblique; }
-
</del><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN)
</span><del>- PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
</del><ins>+ RefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -215,15 +215,6 @@
</span><span class="cx"> void platformDataInit(HFONT, float size, HDC, WCHAR* faceName);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-public:
- bool m_syntheticBold { false };
- bool m_syntheticOblique { false };
- FontOrientation m_orientation { Horizontal };
- float m_size { 0 };
- FontWidthVariant m_widthVariant { RegularWidth };
- TextRenderingMode m_textRenderingMode { AutoTextRendering };
-
-private:
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // FIXME: Get rid of one of these. These two fonts are subtly different, and it is not obvious which one to use where.
</span><span class="cx"> RetainPtr<CTFontRef> m_font;
</span><span class="lines">@@ -239,9 +230,21 @@
</span><span class="cx"> cairo_scaled_font_t* m_scaledFont { nullptr };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // The values below are common to all ports
+ // FIXME: If they're common to all ports, they should move to Font
+ float m_size { 0 };
+
+ FontOrientation m_orientation { Horizontal };
+ FontWidthVariant m_widthVariant { RegularWidth };
+ TextRenderingMode m_textRenderingMode { AutoTextRendering };
+
+ bool m_syntheticBold { false };
+ bool m_syntheticOblique { false };
</ins><span class="cx"> bool m_isColorBitmapFont { false };
</span><span class="cx"> bool m_isHashTableDeletedValue { false };
</span><span class="cx"> bool m_isSystemFont { false };
</span><ins>+ // The values above are common to all ports
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_isEmoji { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> bool syntheticBold, syntheticOblique;
</span><span class="cx"> std::tie(syntheticBold, syntheticOblique) = computeNecessarySynthesis(substituteFont, description, isPlatformFont).boldObliquePair();
</span><span class="cx">
</span><del>- FontPlatformData alternateFont(substituteFont, platformData.size(), syntheticBold, syntheticOblique, platformData.m_orientation, platformData.m_widthVariant, platformData.m_textRenderingMode);
</del><ins>+ FontPlatformData alternateFont(substituteFont, platformData.size(), syntheticBold, syntheticOblique, platformData.orientation(), platformData.widthVariant(), platformData.textRenderingMode());
</ins><span class="cx">
</span><span class="cx"> return fontForPlatformData(alternateFont);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> matrix = CTFontGetMatrix(platformData.font());
</span><span class="cx"> matrix.b = -matrix.b;
</span><span class="cx"> matrix.d = -matrix.d;
</span><del>- if (platformData.m_syntheticOblique) {
</del><ins>+ if (platformData.syntheticOblique()) {
</ins><span class="cx"> static float obliqueSkew = tanf(SYNTHETIC_OBLIQUE_ANGLE * piFloat / 180);
</span><span class="cx"> if (platformData.orientation() == Vertical)
</span><span class="cx"> matrix = CGAffineTransformConcat(matrix, CGAffineTransformMake(1, obliqueSkew, 0, 1, 0, 0));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Unify these two codepaths
</span><span class="cx"> #if USE(APPKIT)
</span><del>- m_syntheticBoldOffset = m_platformData.m_syntheticBold ? 1.0f : 0.f;
</del><ins>+ m_syntheticBoldOffset = m_platformData.syntheticBold() ? 1.0f : 0.f;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</span><span class="cx"> // Work around <rdar://problem/19433490>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> // Some fonts erroneously specify a positive descender value. We follow Core Text in assuming that
</span><span class="cx"> // such fonts meant the same distance, but in the reverse direction.
</span><del>- float pointSize = m_platformData.m_size;
</del><ins>+ float pointSize = m_platformData.size();
</ins><span class="cx"> float ascent = scaleEmToUnits(CGFontGetAscent(m_platformData.cgFont()), unitsPerEm) * pointSize;
</span><span class="cx"> float descent = -scaleEmToUnits(-abs(CGFontGetDescent(m_platformData.cgFont())), unitsPerEm) * pointSize;
</span><span class="cx"> float capHeight = scaleEmToUnits(CGFontGetCapHeight(m_platformData.cgFont()), unitsPerEm) * pointSize;
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>- m_syntheticBoldOffset = m_platformData.m_syntheticBold ? ceilf(m_platformData.size() / 24.0f) : 0.f;
</del><ins>+ m_syntheticBoldOffset = m_platformData.syntheticBold() ? ceilf(m_platformData.size() / 24.0f) : 0.f;
</ins><span class="cx">
</span><span class="cx"> CTFontRef ctFont = m_platformData.font();
</span><span class="cx"> FontServicesIOS fontService(ctFont);
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> if (os2Table && CFDataGetLength(os2Table.get()) >= 4) {
</span><span class="cx"> const UInt8* os2 = CFDataGetBytePtr(os2Table.get());
</span><span class="cx"> SInt16 os2AvgCharWidth = os2[2] * 256 + os2[3];
</span><del>- m_avgCharWidth = scaleEmToUnits(os2AvgCharWidth, m_fontMetrics.unitsPerEm()) * m_platformData.m_size;
</del><ins>+ m_avgCharWidth = scaleEmToUnits(os2AvgCharWidth, m_fontMetrics.unitsPerEm()) * m_platformData.size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> headTable = adoptCF(CGFontCopyTableForTag(m_platformData.cgFont(), 'head'));
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> SInt16 xMin = static_cast<SInt16>(uxMin);
</span><span class="cx"> SInt16 xMax = static_cast<SInt16>(uxMax);
</span><span class="cx"> float diff = static_cast<float>(xMax - xMin);
</span><del>- m_maxCharWidth = scaleEmToUnits(diff, m_fontMetrics.unitsPerEm()) * m_platformData.m_size;
</del><ins>+ m_maxCharWidth = scaleEmToUnits(diff, m_fontMetrics.unitsPerEm()) * m_platformData.size();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -363,17 +363,17 @@
</span><span class="cx"> if (!font)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- FontPlatformData scaledFontData(font, size, false, false, orientation);
-
</del><span class="cx"> if (syntheticBold)
</span><span class="cx"> fontTraits |= kCTFontBoldTrait;
</span><span class="cx"> if (syntheticItalic)
</span><span class="cx"> fontTraits |= kCTFontItalicTrait;
</span><span class="cx">
</span><del>- CTFontSymbolicTraits scaledFontTraits = CTFontGetSymbolicTraits(scaledFontData.font());
- scaledFontData.m_syntheticBold = (fontTraits & kCTFontBoldTrait) && !(scaledFontTraits & kCTFontTraitBold);
- scaledFontData.m_syntheticOblique = (fontTraits & kCTFontItalicTrait) && !(scaledFontTraits & kCTFontTraitItalic);
</del><ins>+ CTFontSymbolicTraits scaledFontTraits = CTFontGetSymbolicTraits(font);
</ins><span class="cx">
</span><ins>+ bool usedSyntheticBold = (fontTraits & kCTFontBoldTrait) && !(scaledFontTraits & kCTFontTraitBold);
+ bool usedSyntheticOblique = (fontTraits & kCTFontItalicTrait) && !(scaledFontTraits & kCTFontTraitItalic);
+ FontPlatformData scaledFontData(font, size, usedSyntheticBold, usedSyntheticOblique, orientation);
+
</ins><span class="cx"> return Font::create(scaledFontData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> float size = m_platformData.size();
</span><span class="cx"> CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(m_platformData.font());
</span><span class="cx"> RetainPtr<CTFontRef> ctFont = createCTFontWithoutSynthesizableFeatures(m_platformData.font());
</span><del>- return createDerivativeFont(ctFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.m_syntheticBold, m_platformData.m_syntheticOblique);
</del><ins>+ return createDerivativeFont(ctFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.syntheticBold(), m_platformData.syntheticOblique());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Font> Font::platformCreateScaledFont(const FontDescription&, float scaleFactor) const
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontCopyFontDescriptor(m_platformData.font()));
</span><span class="cx"> RetainPtr<CTFontRef> scaledFont = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
</span><span class="cx">
</span><del>- return createDerivativeFont(scaledFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.m_syntheticBold, m_platformData.m_syntheticOblique);
</del><ins>+ return createDerivativeFont(scaledFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.syntheticBold(), m_platformData.syntheticOblique());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Font::determinePitch()
</span><span class="lines">@@ -628,14 +628,14 @@
</span><span class="cx"> bool horizontal = platformData().orientation() == Horizontal;
</span><span class="cx"> bool populatedAdvance = false;
</span><span class="cx"> if ((horizontal || m_isBrokenIdeographFallback) && canUseFastGlyphAdvanceGetter(this->platformData(), glyph, advance, populatedAdvance)) {
</span><del>- float pointSize = platformData().m_size;
</del><ins>+ float pointSize = platformData().size();
</ins><span class="cx"> CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
</span><span class="cx"> if (!CGFontGetGlyphAdvancesForStyle(platformData().cgFont(), &m, renderingStyle(platformData()), &glyph, 1, &advance)) {
</span><span class="cx"> RetainPtr<CFStringRef> fullName = adoptCF(CGFontCopyFullName(platformData().cgFont()));
</span><span class="cx"> LOG_ERROR("Unable to cache glyph widths for %@ %f", fullName.get(), pointSize);
</span><span class="cx"> advance.width = 0;
</span><span class="cx"> }
</span><del>- } else if (!populatedAdvance && platformData().m_size)
</del><ins>+ } else if (!populatedAdvance && platformData().size())
</ins><span class="cx"> CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), horizontal ? kCTFontOrientationHorizontal : kCTFontOrientationVertical, &glyph, &advance, 1);
</span><span class="cx">
</span><span class="cx"> return advance.width + m_syntheticBoldOffset;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> return objectForEqualityCheck(ctFont());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</del><ins>+RefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</ins><span class="cx"> {
</span><span class="cx"> if (RetainPtr<CFDataRef> data = adoptCF(CGFontCopyTableForTag(cgFont(), table)))
</span><span class="cx"> return SharedBuffer::wrapCFData(data.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> FontPlatformData(const FontPlatformData&);
</span><span class="cx"> FontPlatformData(const FontPlatformData&, float size);
</span><span class="cx">
</span><ins>+ static FontPlatformData cloneWithOrientation(const FontPlatformData&, FontOrientation);
+ static FontPlatformData cloneWithSyntheticOblique(const FontPlatformData&, bool);
+ static FontPlatformData cloneWithSize(const FontPlatformData&, float);
+
</ins><span class="cx"> ~FontPlatformData();
</span><span class="cx">
</span><span class="cx"> HarfBuzzFace* harfBuzzFace() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -265,6 +265,27 @@
</span><span class="cx"> cairo_scaled_font_destroy(m_scaledFont);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FontPlatformData FontPlatformData::cloneWithOrientation(const FontPlatformData& source, FontOrientation orientation)
+{
+ FontPlatformData copy(source);
+ copy.m_orientation = orientation;
+ return copy;
+}
+
+FontPlatformData FontPlatformData::cloneWithSyntheticOblique(const FontPlatformData& source, bool syntheticOblique)
+{
+ FontPlatformData copy(source);
+ copy.m_syntheticOblique = syntheticOblique;
+ return copy;
+}
+
+FontPlatformData FontPlatformData::cloneWithSize(const FontPlatformData& source, float size)
+{
+ FontPlatformData copy(source);
+ copy.m_size = size;
+ return copy;
+}
+
</ins><span class="cx"> HarfBuzzFace* FontPlatformData::harfBuzzFace() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_harfBuzzFace)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> cairo_matrix_init_identity(&ctm);
</span><span class="cx"> cairo_matrix_init_scale(&sizeMatrix, size, size);
</span><span class="cx">
</span><del>- static cairo_font_options_t* fontOptions = 0;
</del><ins>+ static cairo_font_options_t* fontOptions = nullptr;
</ins><span class="cx"> if (!fontOptions) {
</span><span class="cx"> fontOptions = cairo_font_options_create();
</span><span class="cx"> cairo_font_options_set_antialias(fontOptions, CAIRO_ANTIALIAS_SUBPIXEL);
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_font = source.m_font;
</span><span class="cx"> m_useGDI = source.m_useGDI;
</span><del>- m_scaledFont = 0;
</del><ins>+ m_scaledFont = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (source.m_scaledFont)
</span><span class="cx"> m_scaledFont = cairo_scaled_font_reference(source.m_scaledFont);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> RestoreDC(hdc, -1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</del><ins>+RefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</ins><span class="cx"> {
</span><span class="cx"> HWndDC hdc(0);
</span><span class="cx"> HGDIOBJ oldFont = SelectObject(hdc, hfont());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (200093 => 200094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2016-04-26 17:17:46 UTC (rev 200093)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2016-04-26 17:20:29 UTC (rev 200094)
</span><span class="lines">@@ -135,11 +135,8 @@
</span><span class="cx"> RefPtr<Font> Font::platformCreateScaledFont(const FontDescription& fontDescription, float scaleFactor) const
</span><span class="cx"> {
</span><span class="cx"> float scaledSize = scaleFactor * m_platformData.size();
</span><del>- if (isCustomFont()) {
- FontPlatformData scaledFont(m_platformData);
- scaledFont.setSize(scaledSize);
- return Font::create(scaledFont, true, false);
- }
</del><ins>+ if (isCustomFont())
+ return Font::create(FontPlatformData::cloneWithSize(m_platformData, scaledSize), true, false);
</ins><span class="cx">
</span><span class="cx"> LOGFONT winfont;
</span><span class="cx"> GetObject(m_platformData.hfont(), sizeof(LOGFONT), &winfont);
</span></span></pre>
</div>
</div>
</body>
</html>