Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLTrackElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
index 7dfe53d..b2b6773 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
@@ -26,16 +26,15 @@
 #include "config.h"
 #include "core/html/HTMLTrackElement.h"
 
-#include "HTMLNames.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
+#include "core/HTMLNames.h"
+#include "core/dom/Document.h"
 #include "core/events/Event.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLMediaElement.h"
 #include "platform/Logging.h"
 
-using namespace std;
-
-namespace WebCore {
+namespace blink {
 
 using namespace HTMLNames;
 
@@ -58,15 +57,14 @@ inline HTMLTrackElement::HTMLTrackElement(Document& document)
     ScriptWrappable::init(this);
 }
 
+DEFINE_NODE_FACTORY(HTMLTrackElement)
+
 HTMLTrackElement::~HTMLTrackElement()
 {
+#if !ENABLE(OILPAN)
     if (m_track)
         m_track->clearTrackElement();
-}
-
-PassRefPtr<HTMLTrackElement> HTMLTrackElement::create(Document& document)
-{
-    return adoptRef(new HTMLTrackElement(document));
+#endif
 }
 
 Node::InsertionNotificationRequest HTMLTrackElement::insertedInto(ContainerNode* insertionPoint)
@@ -272,4 +270,10 @@ HTMLMediaElement* HTMLTrackElement::mediaElement() const
     return 0;
 }
 
+void HTMLTrackElement::trace(Visitor* visitor)
+{
+    visitor->trace(m_track);
+    HTMLElement::trace(visitor);
+}
+
 }