Changeset 86299 in webkit

Timestamp:

May 11, 2011 6:20:34 PM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

2011-05-11 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Implements a disable appearance for Media Elements of Qt port.
​https://bugs.webkit.org/show_bug.cgi?id=60561

Implements a disable appearance for the media controls of the Qt port
when the media is not yet available.

• platform/qt/RenderThemeQt.cpp: (WebCore::mediaElementCanPlay): (WebCore::RenderThemeQt::getMediaControlForegroundColor): (WebCore::RenderThemeQt::paintMediaSliderThumb):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/RenderThemeQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Implements a disable appearance for Media Elements of Qt port.
+        https://bugs.webkit.org/show_bug.cgi?id=60561
+
+        Implements a disable appearance for the media controls of the Qt port
+        when the media is not yet available.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::mediaElementCanPlay):
+        (WebCore::RenderThemeQt::getMediaControlForegroundColor):
+        (WebCore::RenderThemeQt::paintMediaSliderThumb):
+
 2011-05-11  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -1209 +1209 @@
 }
 
+static bool mediaElementCanPlay(RenderObject* o)
+{
+    HTMLMediaElement* mediaElement = toParentMediaElement(o);
+    if (!mediaElement)
+        return false;
+
+    return mediaElement->readyState() > HTMLMediaElement::HAVE_METADATA
+           || (mediaElement->readyState() == HTMLMediaElement::HAVE_NOTHING
+               && o->style()->appearance() == MediaPlayButtonPart && mediaElement->preload() == "none");
+}
+
 QColor RenderThemeQt::getMediaControlForegroundColor(RenderObject* o) const
 {
     QColor fgColor = platformActiveSelectionBackgroundColor();
-    if (o && o->node()->active())
+    if (!o)
+        return fgColor;
+
+    if (o->node()->active())
         fgColor = fgColor.lighter();
+
+    if (!mediaElementCanPlay(o)) {
+        QPalette pal = QApplication::palette();
+        setPaletteFromPageClientIfExists(pal);
+        fgColor = pal.brush(QPalette::Disabled, QPalette::Text).color();
+    }
+
     return fgColor;
 }
@@ -1421 +1442 @@
 bool RenderThemeQt::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
+    if (!o->parent()->isSlider())
+        return false;
+
+    // We can get the HTMLMediaElement from the parent of the thumb : MediaControlTimelineElement.
+    HTMLMediaElement* mediaElement = toParentMediaElement(o->parent());
+    if (!mediaElement)
+        return false;
+
     StylePainter p(this, paintInfo);
     if (!p.isValid())
@@ -1428 +1457 @@
 
     p.painter->setPen(Qt::NoPen);
-    p.painter->setBrush(getMediaControlForegroundColor(o));
+    p.painter->setBrush(getMediaControlForegroundColor(o->parent()));
     p.painter->drawRect(r.x(), r.y(), r.width(), r.height());