<!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>[201278] releases/WebKitGTK/webkit-2.12/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/201278">201278</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-23 05:52:41 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/201023">r201023</a> - Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/177786">r177786</a>): GlyphMetricsMap<T>::locatePageSlowCase() fills existing pages with unknown metrics
https://bugs.webkit.org/show_bug.cgi?id=157749
Reviewed by Antti Koivisto.
After <a href="http://trac.webkit.org/projects/webkit/changeset/177786">r177786</a>, GlyphMetricsMap<T>::locatePageSlowCase() would unconditionally fill
pages with unknown metrics. This patch updates the code to do so only if the page
is new, thus restoring the pre-<a href="http://trac.webkit.org/projects/webkit/changeset/177786">r177786</a> behavior.
* platform/graphics/GlyphMetricsMap.h:
(WebCore::GlyphMetricsMap::metricsForGlyph):
(WebCore::GlyphMetricsMap::setMetricsForGlyph):
(WebCore::GlyphMetricsMap::GlyphMetricsPage::GlyphMetricsPage):
(WebCore::GlyphMetricsMap::GlyphMetricsPage::fill):
(WebCore::GlyphMetricsMap::locatePage):
(WebCore::GlyphMetricsMap<T>::locatePageSlowCase):
(WebCore::GlyphMetricsMap::GlyphMetricsPage::metricsForGlyph): Deleted.
(WebCore::GlyphMetricsMap::GlyphMetricsPage::setMetricsForGlyph): Deleted.
(WebCore::GlyphMetricsMap::GlyphMetricsPage::setMetricsForIndex): Deleted.
(WebCore::GlyphMetricsMap<float>::unknownMetrics): Deleted.
(WebCore::GlyphMetricsMap<FloatRect>::unknownMetrics): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsGlyphMetricsMaph">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GlyphMetricsMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201277 => 201278)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 12:36:24 UTC (rev 201277)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 12:52:41 UTC (rev 201278)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-17 Chris Dumez <cdumez@apple.com>
+
+ Regression(r177786): GlyphMetricsMap<T>::locatePageSlowCase() fills existing pages with unknown metrics
+ https://bugs.webkit.org/show_bug.cgi?id=157749
+
+ Reviewed by Antti Koivisto.
+
+ After r177786, GlyphMetricsMap<T>::locatePageSlowCase() would unconditionally fill
+ pages with unknown metrics. This patch updates the code to do so only if the page
+ is new, thus restoring the pre-r177786 behavior.
+
+ * platform/graphics/GlyphMetricsMap.h:
+ (WebCore::GlyphMetricsMap::metricsForGlyph):
+ (WebCore::GlyphMetricsMap::setMetricsForGlyph):
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::GlyphMetricsPage):
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::fill):
+ (WebCore::GlyphMetricsMap::locatePage):
+ (WebCore::GlyphMetricsMap<T>::locatePageSlowCase):
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::metricsForGlyph): Deleted.
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::setMetricsForGlyph): Deleted.
+ (WebCore::GlyphMetricsMap::GlyphMetricsPage::setMetricsForIndex): Deleted.
+ (WebCore::GlyphMetricsMap<float>::unknownMetrics): Deleted.
+ (WebCore::GlyphMetricsMap<FloatRect>::unknownMetrics): Deleted.
+
</ins><span class="cx"> 2016-05-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> heap use-after-free at WebCore::TimerBase::heapPopMin()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsGlyphMetricsMaph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GlyphMetricsMap.h (201277 => 201278)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2016-05-23 12:36:24 UTC (rev 201277)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2016-05-23 12:52:41 UTC (rev 201278)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> GlyphMetricsMap() : m_filledPrimaryPage(false) { }
</span><span class="cx"> T metricsForGlyph(Glyph glyph)
</span><span class="cx"> {
</span><del>- return locatePage(glyph / GlyphMetricsPage::size)->metricsForGlyph(glyph);
</del><ins>+ return locatePage(glyph / GlyphMetricsPage::size).metricsForGlyph(glyph);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setMetricsForGlyph(Glyph glyph, const T& metrics)
</span><span class="cx"> {
</span><del>- locatePage(glyph / GlyphMetricsPage::size)->setMetricsForGlyph(glyph, metrics);
</del><ins>+ locatePage(glyph / GlyphMetricsPage::size).setMetricsForGlyph(glyph, metrics);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -58,6 +58,17 @@
</span><span class="cx"> static const size_t size = 256; // Usually covers Latin-1 in a single page.
</span><span class="cx"> std::array<T, size> m_metrics;
</span><span class="cx">
</span><ins>+ GlyphMetricsPage() = default;
+ GlyphMetricsPage(const T& initialValue)
+ {
+ fill(initialValue);
+ }
+
+ void fill(const T& value)
+ {
+ m_metrics.fill(value);
+ }
+
</ins><span class="cx"> T metricsForGlyph(Glyph glyph) const { return m_metrics[glyph % size]; }
</span><span class="cx"> void setMetricsForGlyph(Glyph glyph, const T& metrics)
</span><span class="cx"> {
</span><span class="lines">@@ -69,14 +80,14 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- GlyphMetricsPage* locatePage(unsigned pageNumber)
</del><ins>+ GlyphMetricsPage& locatePage(unsigned pageNumber)
</ins><span class="cx"> {
</span><span class="cx"> if (!pageNumber && m_filledPrimaryPage)
</span><del>- return &m_primaryPage;
</del><ins>+ return m_primaryPage;
</ins><span class="cx"> return locatePageSlowCase(pageNumber);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GlyphMetricsPage* locatePageSlowCase(unsigned pageNumber);
</del><ins>+ GlyphMetricsPage& locatePageSlowCase(unsigned pageNumber);
</ins><span class="cx">
</span><span class="cx"> static T unknownMetrics();
</span><span class="cx">
</span><span class="lines">@@ -95,27 +106,21 @@
</span><span class="cx"> return FloatRect(0, 0, cGlyphSizeUnknown, cGlyphSizeUnknown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<class T> typename GlyphMetricsMap<T>::GlyphMetricsPage* GlyphMetricsMap<T>::locatePageSlowCase(unsigned pageNumber)
</del><ins>+template<class T> typename GlyphMetricsMap<T>::GlyphMetricsPage& GlyphMetricsMap<T>::locatePageSlowCase(unsigned pageNumber)
</ins><span class="cx"> {
</span><del>- GlyphMetricsPage* page;
</del><span class="cx"> if (!pageNumber) {
</span><span class="cx"> ASSERT(!m_filledPrimaryPage);
</span><del>- page = &m_primaryPage;
</del><ins>+ m_primaryPage.fill(unknownMetrics());
</ins><span class="cx"> m_filledPrimaryPage = true;
</span><del>- } else {
- if (!m_pages)
- m_pages = std::make_unique<HashMap<int, std::unique_ptr<GlyphMetricsPage>>>();
- auto& pageInMap = m_pages->add(pageNumber, nullptr).iterator->value;
- if (!pageInMap)
- pageInMap = std::make_unique<GlyphMetricsPage>();
- page = pageInMap.get();
</del><ins>+ return m_primaryPage;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Fill in the whole page with the unknown glyph information.
- for (unsigned i = 0; i < GlyphMetricsPage::size; i++)
- page->setMetricsForIndex(i, unknownMetrics());
-
- return page;
</del><ins>+ if (!m_pages)
+ m_pages = std::make_unique<HashMap<int, std::unique_ptr<GlyphMetricsPage>>>();
+ auto& pageInMap = m_pages->add(pageNumber, nullptr).iterator->value;
+ if (!pageInMap)
+ pageInMap = std::make_unique<GlyphMetricsPage>(unknownMetrics());
+ return *pageInMap;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>