Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)

New snapshot that adapts to latest Qt API changes

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/WebCore/rendering/RenderMediaControlsChromium.cpp b/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
index efa05186d..b3b82982c 100644
--- a/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
+++ b/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
@@ -240,9 +240,7 @@ static bool paintMediaSlider(RenderObject* object, const PaintInfo& paintInfo, c
 static bool paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
-    Node* hostNode = object->node()->shadowAncestorNode();
-    ASSERT(hostNode);
-    HTMLMediaElement* mediaElement = toParentMediaElement(hostNode);
+    HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 
@@ -295,9 +293,7 @@ static bool paintMediaVolumeSlider(RenderObject* object, const PaintInfo& paintI
 static bool paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
-    Node* hostNode = object->node()->shadowAncestorNode();
-    ASSERT(hostNode);
-    HTMLMediaElement* mediaElement = toParentMediaElement(hostNode);
+    HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;