Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/html/MediaController.h b/src/third_party/WebKit/Source/core/html/MediaController.h
index c9311a9..8d1b6c4 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/MediaController.h
+++ b/src/third_party/WebKit/Source/core/html/MediaController.h
@@ -26,21 +26,20 @@
 #ifndef MediaController_h
 #define MediaController_h
 
-#include "bindings/v8/ScriptWrappable.h"
 #include "core/events/EventTarget.h"
 #include "core/html/HTMLMediaElement.h"
 #include "wtf/LinkedHashSet.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
-namespace WebCore {
+namespace blink {
 
 class Clock;
 class ExceptionState;
 class ExecutionContext;
 class GenericEventQueue;
 
-class MediaController FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaController>, public ScriptWrappable, public EventTargetWithInlineData {
+class MediaController FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaController>, public EventTargetWithInlineData {
     REFCOUNTED_EVENT_TARGET(MediaController);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaController);
 public:
@@ -50,9 +49,9 @@ public:
     void addMediaElement(HTMLMediaElement*);
     void removeMediaElement(HTMLMediaElement*);
 
-    PassRefPtr<TimeRanges> buffered() const;
-    PassRefPtr<TimeRanges> seekable() const;
-    PassRefPtr<TimeRanges> played();
+    PassRefPtrWillBeRawPtr<TimeRanges> buffered() const;
+    PassRefPtrWillBeRawPtr<TimeRanges> seekable() const;
+    PassRefPtrWillBeRawPtr<TimeRanges> played();
 
     double duration() const;
     double currentTime() const;
@@ -131,6 +130,6 @@ private:
     double m_previousTimeupdateTime;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif