Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / events / Event.cpp

diff --git a/src/third_party/WebKit/Source/core/events/Event.cpp b/src/third_party/WebKit/Source/core/events/Event.cpp
index f39236e..498f0de 100644 (file)
--- a/src/third_party/WebKit/Source/core/events/Event.cpp
+++ b/src/third_party/WebKit/Source/core/events/Event.cpp
@@ -50,7 +50,6 @@ Event::Event()
     , m_currentTarget(nullptr)
     , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
 {
-    ScriptWrappable::init(this);
 }
 
 Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg)
@@ -66,7 +65,6 @@ Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableAr
     , m_currentTarget(nullptr)
     , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
 {
-    ScriptWrappable::init(this);
 }
 
 Event::Event(const AtomicString& eventType, const EventInit& initializer)
@@ -82,7 +80,6 @@ Event::Event(const AtomicString& eventType, const EventInit& initializer)
     , m_currentTarget(nullptr)
     , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
 {
-    ScriptWrappable::init(this);
 }
 
 Event::~Event()
@@ -225,7 +222,7 @@ EventPath& Event::ensureEventPath()
 PassRefPtrWillBeRawPtr<StaticNodeList> Event::path() const
 {
     if (!m_currentTarget) {
-        ASSERT(m_eventPhase == PhaseType::NONE);
+        ASSERT(m_eventPhase == Event::NONE);
         if (!m_eventPath) {
             // Before dispatching the event
             return StaticNodeList::createEmpty();
@@ -255,7 +252,7 @@ EventTarget* Event::currentTarget() const
         if (SVGElement* svgElement = toSVGElement(node)->correspondingElement())
             return svgElement;
     }
-    return m_currentTarget;
+    return m_currentTarget.get();
 }
 
 void Event::trace(Visitor* visitor)