Changeset 195309 in webkit

Timestamp:

Jan 19, 2016 12:59:56 PM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r195173.

It relies on r195141 which was rolled out

Reverted changeset:

"Give RuleSet a BumpArena and start using it for
RuleDataVectors."
​https://bugs.webkit.org/show_bug.cgi?id=153169
​http://trac.webkit.org/changeset/195173

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/RuleSet.cpp (modified) (3 diffs)
• css/RuleSet.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-19  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r195173.
+
+        It relies on r195141 which was rolled out
+
+        Reverted changeset:
+
+        "Give RuleSet a BumpArena and start using it for
+        RuleDataVectors."
+        https://bugs.webkit.org/show_bug.cgi?id=153169
+        http://trac.webkit.org/changeset/195173
+
 2016-01-19  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/css/RuleSet.cpp

@@ -184 +184 @@
 }
 
-RuleSet::RuleSet()
-    : m_arena(WTF::BumpArena::create())
-{
-}
-
 void RuleSet::addToRuleSet(AtomicStringImpl* key, AtomRuleMap& map, const RuleData& ruleData)
 {
@@ -195 +190 @@
     auto& rules = map.add(key, nullptr).iterator->value;
     if (!rules)
-        rules = RuleDataVector::create(m_arena.get());
+        rules = std::make_unique<RuleDataVector>();
     rules->append(ruleData);
 }
@@ -405 +400 @@
 {
     for (auto& keyValuePair : other.m_shadowPseudoElementRules)
-        m_shadowPseudoElementRules.add(keyValuePair.key, RuleDataVector::create(m_arena.get(), *keyValuePair.value));
+        m_shadowPseudoElementRules.add(keyValuePair.key, std::make_unique<RuleDataVector>(*keyValuePair.value));
 
 #if ENABLE(VIDEO_TRACK)

trunk/Source/WebCore/css/RuleSet.h

@@ -26 +26 @@
 #include "SelectorCompiler.h"
 #include "StyleRule.h"
-#include <wtf/BumpArena.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
@@ -160 +159 @@
     RuleSet();
 
-    class RuleDataVector : public Vector<RuleData, 1> {
-        WTF_MAKE_BUMPARENA_ALLOCATED;
-    public:
-        static std::unique_ptr<RuleDataVector> create(BumpArena& arena)
-        {
-            return std::unique_ptr<RuleDataVector>(new (&arena) RuleDataVector);
-        }
-        static std::unique_ptr<RuleDataVector> create(BumpArena& arena, const RuleDataVector& other)
-        {
-            return std::unique_ptr<RuleDataVector>(new (&arena) RuleDataVector(other));
-        }
-    };
-
+    typedef Vector<RuleData, 1> RuleDataVector;
     typedef HashMap<AtomicStringImpl*, std::unique_ptr<RuleDataVector>> AtomRuleMap;
 
@@ -227 +214 @@
     RuleDataVector m_universalRules;
     Vector<StyleRulePage*> m_pageRules;
-    unsigned m_ruleCount { 0 };
-    bool m_autoShrinkToFitEnabled { true };
+    unsigned m_ruleCount;
+    bool m_autoShrinkToFitEnabled;
     RuleFeatureSet m_features;
     Vector<RuleSetSelectorPair> m_regionSelectorsAndRuleSets;
-    Ref<BumpArena> m_arena;
-};
+};
+
+inline RuleSet::RuleSet()
+    : m_ruleCount(0)
+    , m_autoShrinkToFitEnabled(true)
+{
+}
 
 inline const RuleSet::RuleDataVector* RuleSet::tagRules(AtomicStringImpl* key, bool isHTMLName) const