Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / shadow / MediaControlElementTypes.h

diff --git a/src/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h b/src/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h
index 6213deb..7002034 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h
+++ b/src/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h
@@ -34,7 +34,7 @@
 #include "core/html/HTMLInputElement.h"
 #include "core/rendering/RenderBlock.h"
 
-namespace WebCore {
+namespace blink {
 
 class HTMLMediaElement;
 class MediaControls;
@@ -79,6 +79,8 @@ public:
 
     MediaControlElementType displayType() { return m_displayType; }
 
+    virtual void trace(Visitor*);
+
 protected:
     MediaControlElement(MediaControls&, MediaControlElementType, HTMLElement*);
 
@@ -90,13 +92,15 @@ protected:
 private:
     MediaControls& m_mediaControls;
     MediaControlElementType m_displayType;
-    HTMLElement* m_element;
+    RawPtrWillBeMember<HTMLElement> m_element;
 };
 
 // ----------------------------
 
 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement);
+public:
+    virtual void trace(Visitor*) OVERRIDE;
 
 protected:
     virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; }
@@ -107,6 +111,8 @@ protected:
 
 class MediaControlInputElement : public HTMLInputElement, public MediaControlElement {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlInputElement);
+public:
+    virtual void trace(Visitor*) OVERRIDE;
 
 protected:
     virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; }
@@ -131,6 +137,6 @@ private:
     double m_currentValue;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // MediaControlElementTypes_h