Changeset 76873 in webkit

Timestamp:

Jan 27, 2011 5:23:22 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-27 Yi Shen <​yi.4.shen@nokia.com>, Tor Arne Vestbø <​tor.arne.vestbo@nokia.com>

Reviewed by Andreas Kling.

[Qt] Add fullscreen media control button for html video
​https://bugs.webkit.org/show_bug.cgi?id=51543

Implement media control fullscreen button for QtWebKit html5 video.

• css/mediaControlsQt.css: (video::-webkit-media-controls-fullscreen-button):
• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::paintMediaFullscreenButton):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/mediaControlsQt.css (modified) (1 diff)
• platform/qt/RenderThemeQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-27  Yi Shen  <yi.4.shen@nokia.com>, Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Add fullscreen media control button for html video
+        https://bugs.webkit.org/show_bug.cgi?id=51543
+
+        Implement media control fullscreen button for QtWebKit html5 video.
+
+        * css/mediaControlsQt.css:
+        (video::-webkit-media-controls-fullscreen-button):
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintMediaFullscreenButton):
+
 2011-01-27  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/css/mediaControlsQt.css

@@ -214 +214 @@
 
 video::-webkit-media-controls-fullscreen-button {
-    display: none;
+    top: 0px;
+    right: 0px;
+    width: 12px;
+    height: 12px;
+    padding: 6px;
+    margin: 5px 5px 5px 3px;
 }
 

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

@@ -1175 +1175 @@
 bool RenderThemeQt::paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    return RenderTheme::paintMediaFullscreenButton(o, paintInfo, r);
+    HTMLMediaElement* mediaElement = getMediaElementFromRenderObject(o);
+    if (!mediaElement)
+        return false;
+
+    StylePainter p(this, paintInfo);
+    if (!p.isValid())
+        return true;
+
+    p.painter->setRenderHint(QPainter::Antialiasing, true);
+
+    paintMediaBackground(p.painter, r);
+
+    WorldMatrixTransformer transformer(p.painter, o, r);
+    const QPointF arrowPolygon[9] = { QPointF(20, 0), QPointF(100, 0), QPointF(100, 80),
+            QPointF(80, 80), QPointF(80, 30), QPointF(10, 100), QPointF(0, 90), QPointF(70, 20), QPointF(20, 20)};
+
+    p.painter->setBrush(getMediaControlForegroundColor(o));
+    p.painter->drawPolygon(arrowPolygon, 9);
+
+    return false;
 }