<!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>[204006] 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/204006">204006</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-08-01 18:44:43 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shrink MediaQuerySets to fit after parsing.
<https://webkit.org/b/160419>
Reviewed by Antti Koivisto.
Add shrinkToFit() helpers to MediaQuerySet and MediaQuery
and call it after parsing to remove extra capacity from their
internal vectors.
This reduces memory usage by 1.24MB on theverge.com.
* css/CSSParser.cpp:
(WebCore::CSSParser::createMediaRule):
* css/MediaList.cpp:
(WebCore::MediaQuerySet::parse):
(WebCore::MediaQuerySet::shrinkToFit):
* css/MediaList.h:
* css/MediaQuery.h:
(WebCore::MediaQuery::shrinkToFit):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaListcpp">trunk/Source/WebCore/css/MediaList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaListh">trunk/Source/WebCore/css/MediaList.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryh">trunk/Source/WebCore/css/MediaQuery.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204005 => 204006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-02 01:39:26 UTC (rev 204005)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 01:44:43 UTC (rev 204006)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-01 Andreas Kling <akling@apple.com>
+
+ Shrink MediaQuerySets to fit after parsing.
+ <https://webkit.org/b/160419>
+
+ Reviewed by Antti Koivisto.
+
+ Add shrinkToFit() helpers to MediaQuerySet and MediaQuery
+ and call it after parsing to remove extra capacity from their
+ internal vectors.
+
+ This reduces memory usage by 1.24MB on theverge.com.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::createMediaRule):
+ * css/MediaList.cpp:
+ (WebCore::MediaQuerySet::parse):
+ (WebCore::MediaQuerySet::shrinkToFit):
+ * css/MediaList.h:
+ * css/MediaQuery.h:
+ (WebCore::MediaQuery::shrinkToFit):
+
</ins><span class="cx"> 2016-08-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> <attachment> action label doesn't wrap, but needs to for some localizations
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (204005 => 204006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-08-02 01:39:26 UTC (rev 204005)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-08-02 01:44:43 UTC (rev 204006)
</span><span class="lines">@@ -12905,8 +12905,10 @@
</span><span class="cx"> // To comply with w3c test suite expectation, create an empty media query
</span><span class="cx"> // even when it is syntactically incorrect.
</span><span class="cx"> rule = StyleRuleMedia::create(MediaQuerySet::create(), emptyRules);
</span><del>- } else
</del><ins>+ } else {
+ media->shrinkToFit();
</ins><span class="cx"> rule = StyleRuleMedia::create(media.releaseNonNull(), rules ? *rules : emptyRules);
</span><ins>+ }
</ins><span class="cx"> processAndAddNewRuleToSourceTreeIfNeeded();
</span><span class="cx"> return rule.releaseNonNull();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaList.cpp (204005 => 204006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaList.cpp 2016-08-02 01:39:26 UTC (rev 204005)
+++ trunk/Source/WebCore/css/MediaList.cpp 2016-08-02 01:44:43 UTC (rev 204006)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> m_queries = WTFMove(result);
</span><ins>+ shrinkToFit();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,6 +199,13 @@
</span><span class="cx"> return text.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaQuerySet::shrinkToFit()
+{
+ m_queries.shrinkToFit();
+ for (auto& query : m_queries)
+ query.shrinkToFit();
+}
+
</ins><span class="cx"> MediaList::MediaList(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet)
</span><span class="cx"> : m_mediaQueries(mediaQueries)
</span><span class="cx"> , m_parentStyleSheet(parentSheet)
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaList.h (204005 => 204006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaList.h 2016-08-02 01:39:26 UTC (rev 204005)
+++ trunk/Source/WebCore/css/MediaList.h 2016-08-02 01:44:43 UTC (rev 204006)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx">
</span><span class="cx"> Ref<MediaQuerySet> copy() const { return adoptRef(*new MediaQuerySet(*this)); }
</span><span class="cx">
</span><ins>+ void shrinkToFit();
+
</ins><span class="cx"> private:
</span><span class="cx"> MediaQuerySet();
</span><span class="cx"> MediaQuerySet(const String& mediaQuery, bool fallbackToDescription);
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQuery.h (204005 => 204006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQuery.h 2016-08-02 01:39:26 UTC (rev 204005)
+++ trunk/Source/WebCore/css/MediaQuery.h 2016-08-02 01:44:43 UTC (rev 204006)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx">
</span><span class="cx"> bool operator==(const MediaQuery& other) const;
</span><span class="cx">
</span><ins>+ void shrinkToFit() { m_expressions.shrinkToFit(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> String serialize() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>