Changeset 102282 in webkit

Timestamp:

Dec 7, 2011 4:28:55 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r102267.
​http://trac.webkit.org/changeset/102267
​https://bugs.webkit.org/show_bug.cgi?id=74032

Breaks build on Chromium Mac Debug (Requested by aklein on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-12-07

Source/JavaScriptCore:

• wtf/HashTraits.h:

Source/WebCore:

• dom/ChildListMutationScope.cpp:

(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::incrementScopingLevel):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::decrementScopingLevel):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/HashTraits.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/ChildListMutationScope.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r102267.
+        http://trac.webkit.org/changeset/102267
+        https://bugs.webkit.org/show_bug.cgi?id=74032
+
+        Breaks build on Chromium Mac Debug (Requested by aklein on
+        #webkit).
+
+        * wtf/HashTraits.h:
+
 2011-12-07  Adam Klein  <adamk@chromium.org>
 

trunk/Source/JavaScriptCore/wtf/HashTraits.h

@@ -118 +118 @@
         typedef PassOwnPtr<P> PassOutType;
         static PassOwnPtr<P> passOut(OwnPtr<P>& value) { return value.release(); }
-        static PassOwnPtr<P> passOut(std::nullptr_t) { return nullptr; }
 
         typedef typename OwnPtr<P>::PtrType PeekType;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r102267.
+        http://trac.webkit.org/changeset/102267
+        https://bugs.webkit.org/show_bug.cgi?id=74032
+
+        Breaks build on Chromium Mac Debug (Requested by aklein on
+        #webkit).
+
+        * dom/ChildListMutationScope.cpp:
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::incrementScopingLevel):
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::decrementScopingLevel):
+
 2011-12-07  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/dom/ChildListMutationScope.cpp

@@ -41 +41 @@
 #include "StaticNodeList.h"
 #include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
+#include <wtf/RefCounted.h>
 
 namespace WebCore {
@@ -51 +51 @@
 // in WebCore) it will likely result in both (a) ASSERTions failing, and (b) mutation records
 // being enqueued for delivery before the outer-most scope closes.
-class ChildListMutationAccumulator {
+class ChildListMutationAccumulator : public RefCounted<ChildListMutationAccumulator> {
     WTF_MAKE_NONCOPYABLE(ChildListMutationAccumulator);
 public:
@@ -96 +96 @@
     typedef HashMap<Node*, unsigned> ScopingLevelMap;
     ScopingLevelMap m_scopingLevels;
-    HashMap<Node*, OwnPtr<ChildListMutationAccumulator> > m_accumulations;
+    HashMap<Node*, RefPtr<ChildListMutationAccumulator> > m_accumulations;
 
     static MutationAccumulationRouter* s_instance;
@@ -217 +217 @@
 void MutationAccumulationRouter::childAdded(Node* target, Node* child)
 {
-    HashMap<Node*, OwnPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
+    HashMap<Node*, RefPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
     ASSERT(iter != m_accumulations.end());
 
@@ -226 +226 @@
 void MutationAccumulationRouter::willRemoveChild(Node* target, Node* child)
 {
-    HashMap<Node*, OwnPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
+    HashMap<Node*, RefPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
     ASSERT(iter != m_accumulations.end());
 
@@ -243 +243 @@
     OwnPtr<MutationObserverInterestGroup> observers = MutationObserverInterestGroup::createForChildListMutation(target);
     if (observers->isEmpty())
-        m_accumulations.set(target, nullptr);
+        m_accumulations.set(target, 0);
     else
-        m_accumulations.set(target, adoptPtr(new ChildListMutationAccumulator(target, observers.release())));
+        m_accumulations.set(target, adoptRef(new ChildListMutationAccumulator(target, observers.release())));
 }
 
@@ -259 +259 @@
     m_scopingLevels.remove(iter);
 
-    OwnPtr<ChildListMutationAccumulator> record = m_accumulations.take(target);
+    RefPtr<ChildListMutationAccumulator> record = m_accumulations.take(target);
     if (record)
         record->enqueueMutationRecord();