<!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>[203262] 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/203262">203262</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-14 19:07:45 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize GlyphMetricsMap
https://bugs.webkit.org/show_bug.cgi?id=159788
Reviewed by Darin Adler.
Modernize GlyphMetricsMap a bit.
* platform/graphics/GlyphMetricsMap.h:
- Drop WTF_MAKE_NONCOPYABLE as the class is already non-copyable due to having
to having a std::unique_ptr data member.
- Drop GlyphMetricsMap default constructor and let the compiler generate it
instead. This required using inline initialization for m_filledPrimaryPage.
(WebCore::GlyphMetricsMap::GlyphMetricsPage::GlyphMetricsPage):
- Make m_metrics data member private as it does not need to be public.
- Make setMetricsForIndex(unsigned index, const T& metrics) setter private
as it does not need to be public.
- Make GlyphMetricsPage(const T& initialValue) constructor explicit as it
takes only 1 parameter.
(WebCore::GlyphMetricsMap<T>::locatePageSlowCase):
- Use HashMap::ensure() to make the code a bit nicer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph">trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203261 => 203262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-15 01:46:25 UTC (rev 203261)
+++ trunk/Source/WebCore/ChangeLog 2016-07-15 02:07:45 UTC (rev 203262)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-07-14 Chris Dumez <cdumez@apple.com>
+
+ Modernize GlyphMetricsMap
+ https://bugs.webkit.org/show_bug.cgi?id=159788
+
+ Reviewed by Darin Adler.
+
+ Modernize GlyphMetricsMap a bit.
+
+ * platform/graphics/GlyphMetricsMap.h:
+ - Drop WTF_MAKE_NONCOPYABLE as the class is already non-copyable due to having
+ to having a std::unique_ptr data member.
+ - Drop GlyphMetricsMap default constructor and let the compiler generate it
+ instead. This required using inline initialization for m_filledPrimaryPage.
+
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::GlyphMetricsPage):
+ - Make m_metrics data member private as it does not need to be public.
+ - Make setMetricsForIndex(unsigned index, const T& metrics) setter private
+ as it does not need to be public.
+ - Make GlyphMetricsPage(const T& initialValue) constructor explicit as it
+ takes only 1 parameter.
+
+ (WebCore::GlyphMetricsMap<T>::locatePageSlowCase):
+ - Use HashMap::ensure() to make the code a bit nicer.
+
</ins><span class="cx"> 2016-07-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphMetricsMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h (203261 => 203262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2016-07-15 01:46:25 UTC (rev 203261)
+++ trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2016-07-15 02:07:45 UTC (rev 203262)
</span><span class="lines">@@ -38,9 +38,8 @@
</span><span class="cx"> const float cGlyphSizeUnknown = -1;
</span><span class="cx">
</span><span class="cx"> template<class T> class GlyphMetricsMap {
</span><del>- WTF_MAKE_NONCOPYABLE(GlyphMetricsMap); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><del>- GlyphMetricsMap() : m_filledPrimaryPage(false) { }
</del><span class="cx"> T metricsForGlyph(Glyph glyph)
</span><span class="cx"> {
</span><span class="cx"> return locatePage(glyph / GlyphMetricsPage::size).metricsForGlyph(glyph);
</span><span class="lines">@@ -56,10 +55,9 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> static const size_t size = 256; // Usually covers Latin-1 in a single page.
</span><del>- std::array<T, size> m_metrics;
</del><span class="cx">
</span><span class="cx"> GlyphMetricsPage() = default;
</span><del>- GlyphMetricsPage(const T& initialValue)
</del><ins>+ explicit GlyphMetricsPage(const T& initialValue)
</ins><span class="cx"> {
</span><span class="cx"> fill(initialValue);
</span><span class="cx"> }
</span><span class="lines">@@ -74,10 +72,14 @@
</span><span class="cx"> {
</span><span class="cx"> setMetricsForIndex(glyph % size, metrics);
</span><span class="cx"> }
</span><ins>+
+ private:
</ins><span class="cx"> void setMetricsForIndex(unsigned index, const T& metrics)
</span><span class="cx"> {
</span><span class="cx"> m_metrics[index] = metrics;
</span><span class="cx"> }
</span><ins>+
+ std::array<T, size> m_metrics;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> GlyphMetricsPage& locatePage(unsigned pageNumber)
</span><span class="lines">@@ -91,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> static T unknownMetrics();
</span><span class="cx">
</span><del>- bool m_filledPrimaryPage;
</del><ins>+ bool m_filledPrimaryPage { false };
</ins><span class="cx"> GlyphMetricsPage m_primaryPage; // We optimize for the page that contains glyph indices 0-255.
</span><span class="cx"> std::unique_ptr<HashMap<int, std::unique_ptr<GlyphMetricsPage>>> m_pages;
</span><span class="cx"> };
</span><span class="lines">@@ -117,10 +119,11 @@
</span><span class="cx">
</span><span class="cx"> if (!m_pages)
</span><span class="cx"> m_pages = std::make_unique<HashMap<int, std::unique_ptr<GlyphMetricsPage>>>();
</span><del>- auto& pageInMap = m_pages->add(pageNumber, nullptr).iterator->value;
- if (!pageInMap)
- pageInMap = std::make_unique<GlyphMetricsPage>(unknownMetrics());
- return *pageInMap;
</del><ins>+
+ auto& page = m_pages->ensure(pageNumber, [] {
+ return std::make_unique<GlyphMetricsPage>(unknownMetrics());
+ }).iterator->value;
+ return *page;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>