Title: [164421] trunk/Source/WebCore
- Revision
- 164421
- Author
- [email protected]
- Date
- 2014-02-20 01:49:53 -0800 (Thu, 20 Feb 2014)
Log Message
Move to using std::unique_ptr for EventListenerMap, EventTarget
https://bugs.webkit.org/show_bug.cgi?id=129062
Reviewed by Andreas Kling.
Replace uses of OwnPtr and PassOwnPtr in the EventListenerMap and
EventTarget classes with std::unique_ptr.
* dom/EventListenerMap.cpp:
(WebCore::EventListenerMap::add):
* dom/EventListenerMap.h:
* dom/EventTarget.cpp:
(WebCore::EventTarget::fireEventListeners):
* dom/EventTarget.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164420 => 164421)
--- trunk/Source/WebCore/ChangeLog 2014-02-20 09:46:47 UTC (rev 164420)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 09:49:53 UTC (rev 164421)
@@ -1,5 +1,22 @@
2014-02-20 Zan Dobersek <[email protected]>
+ Move to using std::unique_ptr for EventListenerMap, EventTarget
+ https://bugs.webkit.org/show_bug.cgi?id=129062
+
+ Reviewed by Andreas Kling.
+
+ Replace uses of OwnPtr and PassOwnPtr in the EventListenerMap and
+ EventTarget classes with std::unique_ptr.
+
+ * dom/EventListenerMap.cpp:
+ (WebCore::EventListenerMap::add):
+ * dom/EventListenerMap.h:
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::fireEventListeners):
+ * dom/EventTarget.h:
+
+2014-02-20 Zan Dobersek <[email protected]>
+
Move to using std::unique_ptr for Document and related classes
https://bugs.webkit.org/show_bug.cgi?id=129063
Modified: trunk/Source/WebCore/dom/EventListenerMap.cpp (164420 => 164421)
--- trunk/Source/WebCore/dom/EventListenerMap.cpp 2014-02-20 09:46:47 UTC (rev 164420)
+++ trunk/Source/WebCore/dom/EventListenerMap.cpp 2014-02-20 09:49:53 UTC (rev 164421)
@@ -130,7 +130,7 @@
return addListenerToVector(m_entries[i].second.get(), listener, useCapture);
}
- m_entries.append(std::make_pair(eventType, adoptPtr(new EventListenerVector)));
+ m_entries.append(std::make_pair(eventType, std::make_unique<EventListenerVector>()));
return addListenerToVector(m_entries.last().second.get(), listener, useCapture);
}
Modified: trunk/Source/WebCore/dom/EventListenerMap.h (164420 => 164421)
--- trunk/Source/WebCore/dom/EventListenerMap.h 2014-02-20 09:46:47 UTC (rev 164420)
+++ trunk/Source/WebCore/dom/EventListenerMap.h 2014-02-20 09:49:53 UTC (rev 164421)
@@ -34,8 +34,8 @@
#define EventListenerMap_h
#include "RegisteredEventListener.h"
+#include <memory>
#include <wtf/Forward.h>
-#include <wtf/PassOwnPtr.h>
#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
@@ -66,7 +66,7 @@
void assertNoActiveIterators();
- Vector<std::pair<AtomicString, OwnPtr<EventListenerVector>>, 2> m_entries;
+ Vector<std::pair<AtomicString, std::unique_ptr<EventListenerVector>>, 2> m_entries;
#ifndef NDEBUG
int m_activeIteratorCount;
Modified: trunk/Source/WebCore/dom/EventTarget.cpp (164420 => 164421)
--- trunk/Source/WebCore/dom/EventTarget.cpp 2014-02-20 09:46:47 UTC (rev 164420)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2014-02-20 09:49:53 UTC (rev 164421)
@@ -255,7 +255,7 @@
size_t i = 0;
size_t size = entry.size();
if (!d->firingEventIterators)
- d->firingEventIterators = adoptPtr(new FiringEventIteratorVector);
+ d->firingEventIterators = std::make_unique<FiringEventIteratorVector>();
d->firingEventIterators->append(FiringEventIterator(event->type(), i, size));
ScriptExecutionContext* context = scriptExecutionContext();
Modified: trunk/Source/WebCore/dom/EventTarget.h (164420 => 164421)
--- trunk/Source/WebCore/dom/EventTarget.h 2014-02-20 09:46:47 UTC (rev 164420)
+++ trunk/Source/WebCore/dom/EventTarget.h 2014-02-20 09:49:53 UTC (rev 164421)
@@ -35,6 +35,7 @@
#include "EventListenerMap.h"
#include "EventNames.h"
#include "EventTargetInterfaces.h"
+#include <memory>
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/text/AtomicStringHash.h>
@@ -97,7 +98,7 @@
~EventTargetData();
EventListenerMap eventListenerMap;
- OwnPtr<FiringEventIteratorVector> firingEventIterators;
+ std::unique_ptr<FiringEventIteratorVector> firingEventIterators;
};
enum EventTargetInterface {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
