summaryrefslogtreecommitdiff
path: root/Source/WebCore/dom/DocumentEventQueue.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/dom/DocumentEventQueue.cpp
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
downloadqtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/dom/DocumentEventQueue.cpp')
-rw-r--r--Source/WebCore/dom/DocumentEventQueue.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/dom/DocumentEventQueue.cpp b/Source/WebCore/dom/DocumentEventQueue.cpp
index 6396f0124..91d198087 100644
--- a/Source/WebCore/dom/DocumentEventQueue.cpp
+++ b/Source/WebCore/dom/DocumentEventQueue.cpp
@@ -35,6 +35,7 @@
#include "ScriptExecutionContext.h"
#include "SuspendableTimer.h"
#include "WebCoreMemoryInstrumentation.h"
+#include <wtf/MemoryInstrumentationHashSet.h>
namespace WebCore {
@@ -112,8 +113,8 @@ void DocumentEventQueue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) c
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
info.addMember(m_pendingEventTimer);
- info.addInstrumentedHashSet(m_queuedEvents);
- info.addInstrumentedHashSet(m_nodesWithQueuedScrollEvents);
+ info.addMember(m_queuedEvents);
+ info.addMember(m_nodesWithQueuedScrollEvents);
}
bool DocumentEventQueue::cancelEvent(Event* event)
@@ -147,7 +148,7 @@ void DocumentEventQueue::pendingEventTimerFired()
RefPtr<DocumentEventQueue> protector(this);
while (!m_queuedEvents.isEmpty()) {
- ListHashSet<RefPtr<Event> >::iterator iter = m_queuedEvents.begin();
+ ListHashSet<RefPtr<Event>, 16>::iterator iter = m_queuedEvents.begin();
RefPtr<Event> event = *iter;
m_queuedEvents.remove(iter);
if (!event)