Index: Source/web/WebDOMEvent.cpp |
diff --git a/Source/web/WebDOMEvent.cpp b/Source/web/WebDOMEvent.cpp |
index 2436dbe040b9163cc50b3e00e7dbafe682b4c732..3adf2cde90e3f14184052e14f5c3395eebb5c23d 100644 |
--- a/Source/web/WebDOMEvent.cpp |
+++ b/Source/web/WebDOMEvent.cpp |
@@ -31,13 +31,11 @@ |
#include "config.h" |
#include "WebDOMEvent.h" |
+#include "EventNames.h" |
#include "core/dom/Node.h" |
#include "core/events/Event.h" |
-#include "core/events/ThreadLocalEventNames.h" |
#include "wtf/PassRefPtr.h" |
-using WebCore::eventNames; |
- |
namespace WebKit { |
class WebDOMEventPrivate : public WebCore::Event { |
@@ -125,19 +123,19 @@ bool WebDOMEvent::isKeyboardEvent() const |
bool WebDOMEvent::isMutationEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(WebCore::eventNames().interfaceForMutationEvent); |
+ return m_private->hasInterface(WebCore::EventNames::MutationEvent); |
} |
bool WebDOMEvent::isTextEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForTextEvent); |
+ return m_private->hasInterface(WebCore::EventNames::TextEvent); |
} |
bool WebDOMEvent::isCompositionEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForCompositionEvent); |
+ return m_private->hasInterface(WebCore::EventNames::CompositionEvent); |
} |
bool WebDOMEvent::isDragEvent() const |
@@ -155,13 +153,13 @@ bool WebDOMEvent::isClipboardEvent() const |
bool WebDOMEvent::isMessageEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForMessageEvent); |
+ return m_private->hasInterface(WebCore::EventNames::MessageEvent); |
} |
bool WebDOMEvent::isWheelEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForWheelEvent); |
+ return m_private->hasInterface(WebCore::EventNames::WheelEvent); |
} |
bool WebDOMEvent::isBeforeTextInsertedEvent() const |
@@ -173,37 +171,37 @@ bool WebDOMEvent::isBeforeTextInsertedEvent() const |
bool WebDOMEvent::isOverflowEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForOverflowEvent); |
+ return m_private->hasInterface(WebCore::EventNames::OverflowEvent); |
} |
bool WebDOMEvent::isPageTransitionEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForPageTransitionEvent); |
+ return m_private->hasInterface(WebCore::EventNames::PageTransitionEvent); |
} |
bool WebDOMEvent::isPopStateEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForPopStateEvent); |
+ return m_private->hasInterface(WebCore::EventNames::PopStateEvent); |
} |
bool WebDOMEvent::isProgressEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForProgressEvent); |
+ return m_private->hasInterface(WebCore::EventNames::ProgressEvent); |
} |
bool WebDOMEvent::isXMLHttpRequestProgressEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForXMLHttpRequestProgressEvent); |
+ return m_private->hasInterface(WebCore::EventNames::XMLHttpRequestProgressEvent); |
} |
bool WebDOMEvent::isBeforeLoadEvent() const |
{ |
ASSERT(m_private.get()); |
- return m_private->hasInterface(eventNames().interfaceForBeforeLoadEvent); |
+ return m_private->hasInterface(WebCore::EventNames::BeforeLoadEvent); |
} |
} // namespace WebKit |