Changeset 195310 in webkit

Timestamp:

Jan 19, 2016 1:00:35 PM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r195179.

It relies on r195141 which was rolled out

Reverted changeset:

"Allocate style sheet media queries in BumpArena."
​https://bugs.webkit.org/show_bug.cgi?id=153188
​http://trac.webkit.org/changeset/195179

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-19  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r195179.
+
+        It relies on r195141 which was rolled out
+
+        Reverted changeset:
+
+        "Allocate style sheet media queries in BumpArena."
+        https://bugs.webkit.org/show_bug.cgi?id=153188
+        http://trac.webkit.org/changeset/195179
+
 2016-01-19  Chris Dumez  <cdumez@apple.com>
 

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

@@ -582 +582 @@
 maybe_source_media_query_exp:
     /* empty */ {
-        $$ = new (parser->arena()) MediaQueryExp;
+        $$ = new MediaQueryExp;
     }
     | base_media_query_exp maybe_space;
@@ -591 +591 @@
         std::unique_ptr<CSSParserValueList> mediaValue($5);
         $3.lower();
-        $$ = new (parser->arena()) MediaQueryExp($3, mediaValue.get());
+        $$ = new MediaQueryExp($3, mediaValue.get());
     }
     ;
@@ -601 +601 @@
             // Create empty media query expression and continue parsing media query.
             delete $3;
-            $$ = new (parser->arena()) MediaQueryExp;
+            $$ = new MediaQueryExp;
         } else
             $$ = $3;
@@ -641 +641 @@
 media_query:
     media_query_exp_list {
-        $$ = new (parser->arena()) MediaQuery(MediaQuery::None, "all", std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($1));
+        $$ = new 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 (parser->arena()) MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
+        $$ = new 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>
@@ -40 +39 @@
 
 class MediaQuery {
-    WTF_MAKE_BUMPARENA_ALLOCATED;
+    WTF_MAKE_FAST_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>
 
@@ -40 +39 @@
 
 class MediaQueryExp {
-    WTF_MAKE_BUMPARENA_ALLOCATED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit MediaQueryExp(const AtomicString& mediaFeature = emptyAtom, CSSParserValueList* values = nullptr);