<!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>[195179] 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/195179">195179</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-01-16 16:21:44 -0800 (Sat, 16 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allocate style sheet media queries in BumpArena.
<https://webkit.org/b/153188>
Reviewed by Antti Koivisto.
Teach the CSS parser to allocate MediaQuery and MediaQueryExp from BumpArena as well.
* css/CSSGrammar.y.in:
* css/MediaQuery.h:
* css/MediaQueryExp.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryh">trunk/Source/WebCore/css/MediaQuery.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryExph">trunk/Source/WebCore/css/MediaQueryExp.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195178 => 195179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-17 00:04:37 UTC (rev 195178)
+++ trunk/Source/WebCore/ChangeLog 2016-01-17 00:21:44 UTC (rev 195179)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-16 Andreas Kling <akling@apple.com>
+
+ Allocate style sheet media queries in BumpArena.
+ <https://webkit.org/b/153188>
+
+ Reviewed by Antti Koivisto.
+
+ Teach the CSS parser to allocate MediaQuery and MediaQueryExp from BumpArena as well.
+
+ * css/CSSGrammar.y.in:
+ * css/MediaQuery.h:
+ * css/MediaQueryExp.h:
+
</ins><span class="cx"> 2016-01-16 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add a couple comments to ScrollbarThemeGtk
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (195178 => 195179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-01-17 00:04:37 UTC (rev 195178)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-01-17 00:21:44 UTC (rev 195179)
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx">
</span><span class="cx"> maybe_source_media_query_exp:
</span><span class="cx"> /* empty */ {
</span><del>- $$ = new MediaQueryExp;
</del><ins>+ $$ = new (parser->arena()) MediaQueryExp;
</ins><span class="cx"> }
</span><span class="cx"> | base_media_query_exp maybe_space;
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> base_media_query_exp: '(' maybe_space IDENT maybe_space maybe_media_value ')' {
</span><span class="cx"> std::unique_ptr<CSSParserValueList> mediaValue($5);
</span><span class="cx"> $3.lower();
</span><del>- $$ = new MediaQueryExp($3, mediaValue.get());
</del><ins>+ $$ = new (parser->arena()) MediaQueryExp($3, mediaValue.get());
</ins><span class="cx"> }
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> // If restrictor is specified, media query expression is invalid.
</span><span class="cx"> // Create empty media query expression and continue parsing media query.
</span><span class="cx"> delete $3;
</span><del>- $$ = new MediaQueryExp;
</del><ins>+ $$ = new (parser->arena()) MediaQueryExp;
</ins><span class="cx"> } else
</span><span class="cx"> $$ = $3;
</span><span class="cx"> }
</span><span class="lines">@@ -640,12 +640,12 @@
</span><span class="cx">
</span><span class="cx"> media_query:
</span><span class="cx"> media_query_exp_list {
</span><del>- $$ = new MediaQuery(MediaQuery::None, "all", std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($1));
</del><ins>+ $$ = new (parser->arena()) MediaQuery(MediaQuery::None, "all", std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($1));
</ins><span class="cx"> }
</span><span class="cx"> |
</span><span class="cx"> maybe_media_restrictor maybe_space IDENT maybe_space maybe_and_media_query_exp_list {
</span><span class="cx"> $3.lower();
</span><del>- $$ = new MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
</del><ins>+ $$ = new (parser->arena()) MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
</ins><span class="cx"> }
</span><span class="cx"> ;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQuery.h (195178 => 195179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQuery.h 2016-01-17 00:04:37 UTC (rev 195178)
+++ trunk/Source/WebCore/css/MediaQuery.h 2016-01-17 00:21:44 UTC (rev 195179)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #define MediaQuery_h
</span><span class="cx">
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/BumpArena.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -38,7 +39,7 @@
</span><span class="cx"> class MediaQueryExp;
</span><span class="cx">
</span><span class="cx"> class MediaQuery {
</span><del>- WTF_MAKE_FAST_ALLOCATED;
</del><ins>+ WTF_MAKE_BUMPARENA_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> enum Restrictor {
</span><span class="cx"> Only, Not, None
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryExph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryExp.h (195178 => 195179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryExp.h 2016-01-17 00:04:37 UTC (rev 195178)
+++ trunk/Source/WebCore/css/MediaQueryExp.h 2016-01-17 00:21:44 UTC (rev 195179)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSValue.h"
</span><span class="cx"> #include "MediaFeatureNames.h"
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/BumpArena.h>
</ins><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,7 +39,7 @@
</span><span class="cx"> class CSSParserValueList;
</span><span class="cx">
</span><span class="cx"> class MediaQueryExp {
</span><del>- WTF_MAKE_FAST_ALLOCATED;
</del><ins>+ WTF_MAKE_BUMPARENA_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> explicit MediaQueryExp(const AtomicString& mediaFeature = emptyAtom, CSSParserValueList* values = nullptr);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>