<!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>[174558] 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/174558">174558</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 21:21:57 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for FontData subclasses
https://bugs.webkit.org/show_bug.cgi?id=137591
Reviewed by Andreas Kling.
Use is<>() / downcast<>() for FontData subclasses.
No new tests, no behavior change.
* platform/graphics/FontData.h:
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::releaseFontData):
(WebCore::FontGlyphs::determinePitch):
* platform/graphics/GlyphPageTreeNode.cpp:
(WebCore::GlyphPageTreeNode::initializePage):
* platform/graphics/SegmentedFontData.h:
(isType):
* platform/graphics/SimpleFontData.h:
(isType):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDatah">trunk/Source/WebCore/platform/graphics/FontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageTreeNodecpp">trunk/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSegmentedFontDatah">trunk/Source/WebCore/platform/graphics/SegmentedFontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/ChangeLog 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-09 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for FontData subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137591
+
+ Reviewed by Andreas Kling.
+
+ Use is<>() / downcast<>() for FontData subclasses.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/FontData.h:
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::releaseFontData):
+ (WebCore::FontGlyphs::determinePitch):
+ * platform/graphics/GlyphPageTreeNode.cpp:
+ (WebCore::GlyphPageTreeNode::initializePage):
+ * platform/graphics/SegmentedFontData.h:
+ (isType):
+ * platform/graphics/SimpleFontData.h:
+ (isType):
+
</ins><span class="cx"> 2014-10-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert part of r174543 that broke grid layout tests.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontData.h (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontData.h 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/platform/graphics/FontData.h 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx"> mutable unsigned m_maxGlyphPageTreeLevel;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define FONT_DATA_TYPE_CASTS(ToValueTypeName, pointerPredicate, referencePredicate) \
- template<typename T> inline ToValueTypeName* to##ToValueTypeName(const RefPtr<T>& fontData) { return to##ToValueTypeName(fontData.get()); } \
- TYPE_CASTS_BASE(ToValueTypeName, FontData, fontData, pointerPredicate, referencePredicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FontData_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -70,18 +70,17 @@
</span><span class="cx"> for (unsigned i = 0; i < numFonts; ++i) {
</span><span class="cx"> if (m_realizedFontData[i]->isCustomFont())
</span><span class="cx"> continue;
</span><del>- ASSERT(!m_realizedFontData[i]->isSegmented());
- fontCache().releaseFontData(toSimpleFontData(m_realizedFontData[i]));
</del><ins>+ fontCache().releaseFontData(downcast<SimpleFontData>(m_realizedFontData[i].get()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontGlyphs::determinePitch(const FontDescription& description) const
</span><span class="cx"> {
</span><span class="cx"> const FontData* fontData = primaryFontData(description);
</span><del>- if (!fontData->isSegmented())
- m_pitch = toSimpleFontData(*fontData).pitch();
</del><ins>+ if (is<SimpleFontData>(*fontData))
+ m_pitch = downcast<SimpleFontData>(*fontData).pitch();
</ins><span class="cx"> else {
</span><del>- const SegmentedFontData& segmentedFontData = toSegmentedFontData(*fontData);
</del><ins>+ const SegmentedFontData& segmentedFontData = downcast<SegmentedFontData>(*fontData);
</ins><span class="cx"> unsigned numRanges = segmentedFontData.numRanges();
</span><span class="cx"> if (numRanges == 1)
</span><span class="cx"> m_pitch = segmentedFontData.rangeAt(0).fontData()->pitch();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageTreeNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -206,31 +206,31 @@
</span><span class="cx"> // Success is not guaranteed. For example, Times fails to fill page 260, giving glyph data
</span><span class="cx"> // for only 128 out of 256 characters.
</span><span class="cx"> bool haveGlyphs;
</span><del>- if (!fontData->isSegmented()) {
- if (GlyphPage::mayUseMixedFontDataWhenFilling(buffer, bufferLength, toSimpleFontData(fontData)))
</del><ins>+ if (is<SimpleFontData>(*fontData)) {
+ if (GlyphPage::mayUseMixedFontDataWhenFilling(buffer, bufferLength, downcast<SimpleFontData>(fontData)))
</ins><span class="cx"> m_page = GlyphPage::createForMixedFontData(this);
</span><span class="cx"> else
</span><del>- m_page = GlyphPage::createForSingleFontData(this, toSimpleFontData(fontData));
</del><ins>+ m_page = GlyphPage::createForSingleFontData(this, downcast<SimpleFontData>(fontData));
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: Times New Roman contains Arabic glyphs, but Core Text doesn't know how to shape them. See <rdar://problem/9823975>.
</span><span class="cx"> // Once we have the fix for <rdar://problem/9823975> then remove this code together with SimpleFontData::shouldNotBeUsedForArabic()
</span><span class="cx"> // in <rdar://problem/12096835>.
</span><del>- if (pageNumber == 6 && toSimpleFontData(fontData)->shouldNotBeUsedForArabic())
</del><ins>+ if (pageNumber == 6 && downcast<SimpleFontData>(*fontData).shouldNotBeUsedForArabic())
</ins><span class="cx"> haveGlyphs = false;
</span><span class="cx"> else
</span><span class="cx"> #endif
</span><del>- haveGlyphs = fill(m_page.get(), 0, GlyphPage::size, buffer, bufferLength, toSimpleFontData(fontData));
</del><ins>+ haveGlyphs = fill(m_page.get(), 0, GlyphPage::size, buffer, bufferLength, downcast<SimpleFontData>(fontData));
</ins><span class="cx"> } else {
</span><span class="cx"> m_page = GlyphPage::createForMixedFontData(this);
</span><span class="cx"> haveGlyphs = false;
</span><span class="cx">
</span><del>- const SegmentedFontData* segmentedFontData = toSegmentedFontData(fontData);
- unsigned numRanges = segmentedFontData->numRanges();
</del><ins>+ const SegmentedFontData& segmentedFontData = downcast<SegmentedFontData>(*fontData);
+ unsigned numRanges = segmentedFontData.numRanges();
</ins><span class="cx"> bool zeroFilled = false;
</span><span class="cx"> RefPtr<GlyphPage> scratchPage;
</span><span class="cx"> GlyphPage* pageToFill = m_page.get();
</span><span class="cx"> for (unsigned i = 0; i < numRanges; i++) {
</span><del>- const FontDataRange& range = segmentedFontData->rangeAt(i);
</del><ins>+ const FontDataRange& range = segmentedFontData.rangeAt(i);
</ins><span class="cx"> // all this casting is to ensure all the parameters to min and max have the same type,
</span><span class="cx"> // to avoid ambiguous template parameter errors on Windows
</span><span class="cx"> int from = std::max(0, static_cast<int>(range.from()) - static_cast<int>(start));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSegmentedFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SegmentedFontData.h (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SegmentedFontData.h 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/platform/graphics/SegmentedFontData.h 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define SegmentedFontData_h
</span><span class="cx">
</span><span class="cx"> #include "FontData.h"
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -80,8 +81,10 @@
</span><span class="cx"> Vector<FontDataRange, 1> m_ranges;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-FONT_DATA_TYPE_CASTS(SegmentedFontData, fontData->isSegmented(), fontData.isSegmented())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SegmentedFontData)
+ static bool isType(const WebCore::FontData& fontData) { return fontData.isSegmented(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // SegmentedFontData_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (174557 => 174558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-10-10 03:57:14 UTC (rev 174557)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-10-10 04:21:57 UTC (rev 174558)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "TypesettingFeatures.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -391,7 +392,10 @@
</span><span class="cx"> return width;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FONT_DATA_TYPE_CASTS(SimpleFontData, !fontData->isSegmented(), !fontData.isSegmented())
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-} // namespace WebCore
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SimpleFontData)
+ static bool isType(const WebCore::FontData& fontData) { return !fontData.isSegmented(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // SimpleFontData_h
</span></span></pre>
</div>
</div>
</body>
</html>