Title: [195310] trunk/Source/WebCore
- Revision
- 195310
- Author
- [email protected]
- Date
- 2016-01-19 13:00:35 -0800 (Tue, 19 Jan 2016)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195309 => 195310)
--- trunk/Source/WebCore/ChangeLog 2016-01-19 20:59:56 UTC (rev 195309)
+++ trunk/Source/WebCore/ChangeLog 2016-01-19 21:00:35 UTC (rev 195310)
@@ -1,5 +1,17 @@
2016-01-19 Chris Dumez <[email protected]>
+ 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 <[email protected]>
+
Unreviewed, rolling out r195173.
It relies on r195141 which was rolled out
Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (195309 => 195310)
--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-01-19 20:59:56 UTC (rev 195309)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-01-19 21:00:35 UTC (rev 195310)
@@ -581,7 +581,7 @@
maybe_source_media_query_exp:
/* empty */ {
- $$ = new (parser->arena()) MediaQueryExp;
+ $$ = new MediaQueryExp;
}
| base_media_query_exp maybe_space;
@@ -590,7 +590,7 @@
base_media_query_exp: '(' maybe_space IDENT maybe_space maybe_media_value ')' {
std::unique_ptr<CSSParserValueList> mediaValue($5);
$3.lower();
- $$ = new (parser->arena()) MediaQueryExp($3, mediaValue.get());
+ $$ = new MediaQueryExp($3, mediaValue.get());
}
;
@@ -600,7 +600,7 @@
// If restrictor is specified, media query _expression_ is invalid.
// Create empty media query _expression_ and continue parsing media query.
delete $3;
- $$ = new (parser->arena()) MediaQueryExp;
+ $$ = new MediaQueryExp;
} else
$$ = $3;
}
@@ -640,12 +640,12 @@
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));
}
;
Modified: trunk/Source/WebCore/css/MediaQuery.h (195309 => 195310)
--- trunk/Source/WebCore/css/MediaQuery.h 2016-01-19 20:59:56 UTC (rev 195309)
+++ trunk/Source/WebCore/css/MediaQuery.h 2016-01-19 21:00:35 UTC (rev 195310)
@@ -30,7 +30,6 @@
#define MediaQuery_h
#include <memory>
-#include <wtf/BumpArena.h>
#include <wtf/Vector.h>
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
@@ -39,7 +38,7 @@
class MediaQueryExp;
class MediaQuery {
- WTF_MAKE_BUMPARENA_ALLOCATED;
+ WTF_MAKE_FAST_ALLOCATED;
public:
enum Restrictor {
Only, Not, None
Modified: trunk/Source/WebCore/css/MediaQueryExp.h (195309 => 195310)
--- trunk/Source/WebCore/css/MediaQueryExp.h 2016-01-19 20:59:56 UTC (rev 195309)
+++ trunk/Source/WebCore/css/MediaQueryExp.h 2016-01-19 21:00:35 UTC (rev 195310)
@@ -31,7 +31,6 @@
#include "CSSValue.h"
#include "MediaFeatureNames.h"
#include <memory>
-#include <wtf/BumpArena.h>
#include <wtf/text/AtomicString.h>
namespace WebCore {
@@ -39,7 +38,7 @@
class CSSParserValueList;
class MediaQueryExp {
- WTF_MAKE_BUMPARENA_ALLOCATED;
+ WTF_MAKE_FAST_ALLOCATED;
public:
explicit MediaQueryExp(const AtomicString& mediaFeature = emptyAtom, CSSParserValueList* values = nullptr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes