Diff
Modified: trunk/Source/WebCore/ChangeLog (173233 => 173234)
--- trunk/Source/WebCore/ChangeLog 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 22:02:08 UTC (rev 173234)
@@ -1,3 +1,37 @@
+2014-09-03 Anders Carlsson <ander...@apple.com>
+
+ Get rid of some uses of OwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=136503
+
+ Reviewed by Sam Weinig.
+
+ * dom/ElementRareData.cpp:
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::create): Deleted.
+ * dom/MutationObserverRegistration.cpp:
+ (WebCore::MutationObserverRegistration::create): Deleted.
+ * dom/MutationObserverRegistration.h:
+ * dom/Node.cpp:
+ (WebCore::Node::materializeRareData):
+ (WebCore::Node::didMoveToNewDocument):
+ (WebCore::eventTargetDataMap):
+ (WebCore::Node::eventTargetData):
+ (WebCore::Node::ensureEventTargetData):
+ (WebCore::Node::mutationObserverRegistry):
+ (WebCore::Node::registerMutationObserver):
+ (WebCore::Node::unregisterMutationObserver):
+ (WebCore::Node::notifyMutationObserversNodeWillDetach):
+ * dom/Node.h:
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::NodeListsNodeData):
+ (WebCore::NodeRareData::NodeRareData):
+ (WebCore::NodeRareData::clearNodeLists):
+ (WebCore::NodeRareData::ensureNodeLists):
+ (WebCore::NodeRareData::ensureMutationObserverData):
+ (WebCore::NodeListsNodeData::create): Deleted.
+ (WebCore::NodeMutationObserverData::create): Deleted.
+ (WebCore::NodeRareData::create): Deleted.
+
2014-09-02 Maciej Stachowiak <m...@apple.com>
Clean up naming for and slightly refactor legacy video fullscreen support
Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (173233 => 173234)
--- trunk/Source/WebCore/dom/ElementRareData.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp 2014-09-03 22:02:08 UTC (rev 173234)
@@ -42,6 +42,6 @@
void* pointers[7];
};
-COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall);
+static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/ElementRareData.h (173233 => 173234)
--- trunk/Source/WebCore/dom/ElementRareData.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2014-09-03 22:02:08 UTC (rev 173234)
@@ -36,8 +36,7 @@
class ElementRareData : public NodeRareData {
public:
- static PassOwnPtr<ElementRareData> create(RenderElement* renderer) { return adoptPtr(new ElementRareData(renderer)); }
-
+ explicit ElementRareData(RenderElement*);
~ElementRareData();
void setBeforePseudoElement(PassRefPtr<PseudoElement>);
@@ -146,7 +145,6 @@
RefPtr<PseudoElement> m_beforePseudoElement;
RefPtr<PseudoElement> m_afterPseudoElement;
- explicit ElementRareData(RenderElement*);
void releasePseudoElement(PseudoElement*);
};
Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.cpp (173233 => 173234)
--- trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-09-03 22:02:08 UTC (rev 173234)
@@ -37,11 +37,6 @@
namespace WebCore {
-PassOwnPtr<MutationObserverRegistration> MutationObserverRegistration::create(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
-{
- return adoptPtr(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter));
-}
-
MutationObserverRegistration::MutationObserverRegistration(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
: m_observer(observer)
, m_registrationNode(registrationNode)
Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.h (173233 => 173234)
--- trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-09-03 22:02:08 UTC (rev 173234)
@@ -42,7 +42,7 @@
class MutationObserverRegistration {
public:
- static PassOwnPtr<MutationObserverRegistration> create(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
+ MutationObserverRegistration(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
~MutationObserverRegistration();
void resetObservation(MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
@@ -61,8 +61,6 @@
void addRegistrationNodesToSet(HashSet<Node*>&) const;
private:
- MutationObserverRegistration(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
-
RefPtr<MutationObserver> m_observer;
Node* m_registrationNode;
RefPtr<Node> m_registrationNodeKeepAlive;
Modified: trunk/Source/WebCore/dom/Node.cpp (173233 => 173234)
--- trunk/Source/WebCore/dom/Node.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-09-03 22:02:08 UTC (rev 173234)
@@ -329,9 +329,9 @@
{
NodeRareData* data;
if (isElementNode())
- data = ""
+ data = ""
else
- data = ""
+ data = ""
ASSERT(data);
m_data.m_rareData = data;
@@ -1755,16 +1755,14 @@
}
}
- if (Vector<OwnPtr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
- for (size_t i = 0; i < registry->size(); ++i) {
- document().addMutationObserverTypes(registry->at(i)->mutationTypes());
- }
+ if (Vector<std::unique_ptr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
+ for (const auto& registration : *registry)
+ document().addMutationObserverTypes(registration->mutationTypes());
}
if (HashSet<MutationObserverRegistration*>* transientRegistry = transientMutationObserverRegistry()) {
- for (HashSet<MutationObserverRegistration*>::iterator iter = transientRegistry->begin(); iter != transientRegistry->end(); ++iter) {
- document().addMutationObserverTypes((*iter)->mutationTypes());
- }
+ for (const auto& registration : *transientRegistry)
+ document().addMutationObserverTypes(registration->mutationTypes());
}
}
@@ -1852,27 +1850,27 @@
return tryRemoveEventListener(this, eventType, listener, useCapture);
}
-typedef HashMap<Node*, OwnPtr<EventTargetData>> EventTargetDataMap;
+typedef HashMap<Node*, std::unique_ptr<EventTargetData>> EventTargetDataMap;
static EventTargetDataMap& eventTargetDataMap()
{
- DEPRECATED_DEFINE_STATIC_LOCAL(EventTargetDataMap, map, ());
+ static NeverDestroyed<EventTargetDataMap> map;
+
return map;
}
EventTargetData* Node::eventTargetData()
{
- return hasEventTargetData() ? eventTargetDataMap().get(this) : 0;
+ return hasEventTargetData() ? eventTargetDataMap().get(this) : nullptr;
}
EventTargetData& Node::ensureEventTargetData()
{
if (hasEventTargetData())
return *eventTargetDataMap().get(this);
+
setHasEventTargetData(true);
- EventTargetData* data = "" EventTargetData;
- eventTargetDataMap().set(this, adoptPtr(data));
- return *data;
+ return *eventTargetDataMap().set(this, std::make_unique<EventTargetData>()).iterator->value;
}
void Node::clearEventTargetData()
@@ -1880,7 +1878,7 @@
eventTargetDataMap().remove(this);
}
-Vector<OwnPtr<MutationObserverRegistration>>* Node::mutationObserverRegistry()
+Vector<std::unique_ptr<MutationObserverRegistration>>* Node::mutationObserverRegistry()
{
if (!hasRareData())
return 0;
@@ -1929,8 +1927,9 @@
void Node::registerMutationObserver(MutationObserver* observer, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
{
- MutationObserverRegistration* registration = 0;
- Vector<OwnPtr<MutationObserverRegistration>>& registry = ensureRareData().ensureMutationObserverData().registry;
+ MutationObserverRegistration* registration = nullptr;
+ auto& registry = ensureRareData().ensureMutationObserverData().registry;
+
for (size_t i = 0; i < registry.size(); ++i) {
if (registry[i]->observer() == observer) {
registration = registry[i].get();
@@ -1939,7 +1938,7 @@
}
if (!registration) {
- registry.append(MutationObserverRegistration::create(observer, this, options, attributeFilter));
+ registry.append(std::make_unique<MutationObserverRegistration>(observer, this, options, attributeFilter));
registration = registry.last().get();
}
@@ -1948,17 +1947,17 @@
void Node::unregisterMutationObserver(MutationObserverRegistration* registration)
{
- Vector<OwnPtr<MutationObserverRegistration>>* registry = mutationObserverRegistry();
+ auto* registry = mutationObserverRegistry();
ASSERT(registry);
if (!registry)
return;
- size_t index = registry->find(registration);
- ASSERT(index != notFound);
- if (index == notFound)
- return;
-
- registry->remove(index);
+ for (size_t i = 0; i < registry->size(); ++i) {
+ if (registry->at(i).get() == registration) {
+ registry->remove(i);
+ return;
+ }
+ }
}
void Node::registerTransientMutationObserver(MutationObserverRegistration* registration)
@@ -1983,7 +1982,7 @@
return;
for (Node* node = parentNode(); node; node = node->parentNode()) {
- if (Vector<OwnPtr<MutationObserverRegistration>>* registry = node->mutationObserverRegistry()) {
+ if (auto* registry = node->mutationObserverRegistry()) {
const size_t size = registry->size();
for (size_t i = 0; i < size; ++i)
registry->at(i)->observedSubtreeNodeWillDetach(this);
Modified: trunk/Source/WebCore/dom/Node.h (173233 => 173234)
--- trunk/Source/WebCore/dom/Node.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/Node.h 2014-09-03 22:02:08 UTC (rev 173234)
@@ -693,7 +693,7 @@
void trackForDebugging();
void materializeRareData();
- Vector<OwnPtr<MutationObserverRegistration>>* mutationObserverRegistry();
+ Vector<std::unique_ptr<MutationObserverRegistration>>* mutationObserverRegistry();
HashSet<MutationObserverRegistration*>* transientMutationObserverRegistry();
mutable uint32_t m_nodeFlags;
Modified: trunk/Source/WebCore/dom/NodeRareData.h (173233 => 173234)
--- trunk/Source/WebCore/dom/NodeRareData.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-09-03 22:02:08 UTC (rev 173234)
@@ -34,8 +34,6 @@
#include "QualifiedName.h"
#include "TagNodeList.h"
#include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
#include <wtf/text/AtomicString.h>
#include <wtf/text/StringHash.h>
@@ -60,6 +58,12 @@
class NodeListsNodeData {
WTF_MAKE_NONCOPYABLE(NodeListsNodeData); WTF_MAKE_FAST_ALLOCATED;
public:
+ NodeListsNodeData()
+ : m_childNodeList(nullptr)
+ , m_emptyChildNodeList(nullptr)
+ {
+ }
+
void clearChildNodeListCache()
{
if (m_childNodeList)
@@ -218,11 +222,6 @@
m_cachedCollections.remove(namedCollectionKey(collection->type(), name));
}
- static PassOwnPtr<NodeListsNodeData> create()
- {
- return adoptPtr(new NodeListsNodeData);
- }
-
void invalidateCaches(const QualifiedName* attrName = 0);
bool isEmpty() const
{
@@ -258,12 +257,6 @@
}
private:
- NodeListsNodeData()
- : m_childNodeList(nullptr)
- , m_emptyChildNodeList(nullptr)
- {
- }
-
std::pair<unsigned char, AtomicString> namedCollectionKey(CollectionType type, const AtomicString& name)
{
return std::pair<unsigned char, AtomicString>(type, name);
@@ -290,26 +283,26 @@
class NodeMutationObserverData {
WTF_MAKE_NONCOPYABLE(NodeMutationObserverData); WTF_MAKE_FAST_ALLOCATED;
public:
- Vector<OwnPtr<MutationObserverRegistration>> registry;
+ Vector<std::unique_ptr<MutationObserverRegistration>> registry;
HashSet<MutationObserverRegistration*> transientRegistry;
- static PassOwnPtr<NodeMutationObserverData> create() { return adoptPtr(new NodeMutationObserverData); }
-
-private:
NodeMutationObserverData() { }
};
class NodeRareData : public NodeRareDataBase {
WTF_MAKE_NONCOPYABLE(NodeRareData); WTF_MAKE_FAST_ALLOCATED;
public:
- static PassOwnPtr<NodeRareData> create(RenderObject* renderer) { return adoptPtr(new NodeRareData(renderer)); }
+ NodeRareData(RenderObject* renderer)
+ : NodeRareDataBase(renderer)
+ , m_connectedFrameCount(0)
+ { }
- void clearNodeLists() { m_nodeLists.clear(); }
+ void clearNodeLists() { m_nodeLists = nullptr; }
NodeListsNodeData* nodeLists() const { return m_nodeLists.get(); }
NodeListsNodeData& ensureNodeLists()
{
if (!m_nodeLists)
- m_nodeLists = NodeListsNodeData::create();
+ m_nodeLists = std::make_unique<NodeListsNodeData>();
return *m_nodeLists;
}
@@ -317,7 +310,7 @@
NodeMutationObserverData& ensureMutationObserverData()
{
if (!m_mutationObserverData)
- m_mutationObserverData = NodeMutationObserverData::create();
+ m_mutationObserverData = std::make_unique<NodeMutationObserverData>();
return *m_mutationObserverData;
}
@@ -333,17 +326,11 @@
m_connectedFrameCount -= amount;
}
-protected:
- NodeRareData(RenderObject* renderer)
- : NodeRareDataBase(renderer)
- , m_connectedFrameCount(0)
- { }
-
private:
unsigned m_connectedFrameCount : 10; // Must fit Page::maxNumberOfFrames.
- OwnPtr<NodeListsNodeData> m_nodeLists;
- OwnPtr<NodeMutationObserverData> m_mutationObserverData;
+ std::unique_ptr<NodeListsNodeData> m_nodeLists;
+ std::unique_ptr<NodeMutationObserverData> m_mutationObserverData;
};
inline bool NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node& ownerNode)
@@ -370,7 +357,7 @@
}
// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
-COMPILE_ASSERT(Page::maxNumberOfFrames < 1024, Frame_limit_should_fit_in_rare_data_count);
+static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
} // namespace WebCore
