Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderMediaControls.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderMediaControls.cpp b/src/third_party/WebKit/Source/core/rendering/RenderMediaControls.cpp
index 90b28aa..6288aa3 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderMediaControls.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderMediaControls.cpp
@@ -28,14 +28,14 @@
 #include "config.h"
 #include "core/rendering/RenderMediaControls.h"
 
-#include "bindings/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/TimeRanges.h"
 #include "core/rendering/PaintInfo.h"
 #include "platform/graphics/Gradient.h"
 #include "platform/graphics/GraphicsContext.h"
 
-namespace WebCore {
+namespace blink {
 
 typedef WTF::HashMap<const char*, Image*> MediaControlImageMap;
 static MediaControlImageMap* gMediaControlImageMap = 0;
@@ -205,7 +205,7 @@ static bool paintMediaSlider(RenderObject* object, const PaintInfo& paintInfo, c
 
     // Draw the buffered range. Since the element may have multiple buffered ranges and it'd be
     // distracting/'busy' to show all of them, show only the buffered range containing the current play head.
-    RefPtr<TimeRanges> bufferedTimeRanges = mediaElement->buffered();
+    RefPtrWillBeRawPtr<TimeRanges> bufferedTimeRanges = mediaElement->buffered();
     float duration = mediaElement->duration();
     float currentTime = mediaElement->currentTime();
     if (std::isnan(duration) || std::isinf(duration) || !duration || std::isnan(currentTime))
@@ -440,4 +440,4 @@ String RenderMediaControls::formatMediaControlsCurrentTime(float currentTime, fl
     return formatChromiumMediaControlsTime(currentTime, duration);
 }
 
-} // namespace WebCore
+} // namespace blink