Changeset 195179 in webkit

Timestamp:

Jan 16, 2016 4:21:44 PM (8 years ago)

Author:

akling@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGrammar.y.in (modified) (4 diffs)
• css/MediaQuery.h (modified) (2 diffs)
• css/MediaQueryExp.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-01-16  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/css/CSSGrammar.y.in

@@ -582 +582 @@
 maybe_source_media_query_exp:
     /* empty */ {
-        $$ = new MediaQueryExp;
+        $$ = new (parser->arena()) MediaQueryExp;
     }
     | base_media_query_exp maybe_space;
@@ -591 +591 @@
         std::unique_ptr<CSSParserValueList> mediaValue($5);
         $3.lower();
-        $$ = new MediaQueryExp($3, mediaValue.get());
+        $$ = new (parser->arena()) MediaQueryExp($3, mediaValue.get());
     }
     ;
@@ -601 +601 @@
             // Create empty media query expression and continue parsing media query.
             delete $3;
-            $$ = new MediaQueryExp;
+            $$ = new (parser->arena()) MediaQueryExp;
         } else
             $$ = $3;
@@ -641 +641 @@
 media_query:
     media_query_exp_list {
-        $$ = new MediaQuery(MediaQuery::None, "all", std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($1));
+        $$ = new (parser->arena()) MediaQuery(MediaQuery::None, "all", std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($1));
     }
     |
     maybe_media_restrictor maybe_space IDENT maybe_space maybe_and_media_query_exp_list {
         $3.lower();
-        $$ = new MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
+        $$ = new (parser->arena()) MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
     }
     ;

trunk/Source/WebCore/css/MediaQuery.h

@@ -31 +31 @@
 
 #include <memory>
+#include <wtf/BumpArena.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
@@ -39 +40 @@
 
 class MediaQuery {
-    WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_BUMPARENA_ALLOCATED;
 public:
     enum Restrictor {

trunk/Source/WebCore/css/MediaQueryExp.h

@@ -32 +32 @@
 #include "MediaFeatureNames.h"
 #include <memory>
+#include <wtf/BumpArena.h>
 #include <wtf/text/AtomicString.h>
 
@@ -39 +40 @@
 
 class MediaQueryExp {
-    WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_BUMPARENA_ALLOCATED;
 public:
     explicit MediaQueryExp(const AtomicString& mediaFeature = emptyAtom, CSSParserValueList* values = nullptr);