diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebCore/dom/DocumentEventQueue.cpp | |
parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebCore/dom/DocumentEventQueue.cpp')
-rw-r--r-- | Source/WebCore/dom/DocumentEventQueue.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Source/WebCore/dom/DocumentEventQueue.cpp b/Source/WebCore/dom/DocumentEventQueue.cpp index 91d198087..8f7459566 100644 --- a/Source/WebCore/dom/DocumentEventQueue.cpp +++ b/Source/WebCore/dom/DocumentEventQueue.cpp @@ -36,15 +36,10 @@ #include "SuspendableTimer.h" #include "WebCoreMemoryInstrumentation.h" #include <wtf/MemoryInstrumentationHashSet.h> +#include <wtf/MemoryInstrumentationListHashSet.h> namespace WebCore { -static inline bool shouldDispatchScrollEventSynchronously(Document* document) -{ - ASSERT_ARG(document, document); - return applicationIsSafari() && (document->url().protocolIs("feed") || document->url().protocolIs("feeds")); -} - class DocumentEventQueueTimer : public SuspendableTimer { WTF_MAKE_NONCOPYABLE(DocumentEventQueueTimer); public: @@ -97,11 +92,6 @@ void DocumentEventQueue::enqueueOrDispatchScrollEvent(PassRefPtr<Node> target, S bool canBubble = targetType == ScrollEventDocumentTarget; RefPtr<Event> scrollEvent = Event::create(eventNames().scrollEvent, canBubble, false /* non cancelleable */); - if (shouldDispatchScrollEventSynchronously(target->document())) { - target->dispatchEvent(scrollEvent.release()); - return; - } - if (!m_nodesWithQueuedScrollEvents.add(target.get()).isNewEntry) return; |