Merge 92347

Source/WebCore/rendering/RenderThemeWinCE.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 461 matching lines @@
     style->setColor(textColor);
 }
 
 #if ENABLE(VIDEO)
 // Attempt to retrieve a HTMLMediaElement from a Node. Returns 0 if one cannot be found.
 static HTMLMediaElement* mediaElementParent(Node* node)
 {
     if (!node)
         return 0;
     Node* mediaNode = node->shadowAncestorNode();
-    if (!mediaNode || (!mediaNode->hasTagName(HTMLNames::videoTag) && !mediaNode->hasTagName(HTMLNames::audioTag)))
+    if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 
     return static_cast<HTMLMediaElement*>(mediaNode);
 }
 #endif
 
 bool RenderThemeWinCE::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r)
 {
     bool rc = RenderTheme::paintSliderTrack(o, i, r);
     IntPoint left = IntPoint(r.x() + 2, (r.y() + r.maxY()) / 2);
@@ skipping 146 matching lines @@
     return paintSliderTrack(o, paintInfo, r);
 }
 
 bool RenderThemeWinCE::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     return paintSliderThumb(o, paintInfo, r);
 }
 #endif
 
 } // namespace WebCore