[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 69ac51510ab0643d9377f7b713cb6c3934fb321a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 01:23:22 2011 +0000

    2011-01-27  Yi Shen  <yi.4.shen at nokia.com>, Tor Arne Vestbø <tor.arne.vestbo at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cca2f1e..63fceb4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-27  Yi Shen  <yi.4.shen at nokia.com>, Tor Arne Vestbø <tor.arne.vestbo at 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 at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebCore/css/mediaControlsQt.css b/Source/WebCore/css/mediaControlsQt.css
index 871a5b8..eca198e 100644
--- a/Source/WebCore/css/mediaControlsQt.css
+++ b/Source/WebCore/css/mediaControlsQt.css
@@ -213,7 +213,12 @@ audio::-webkit-media-controls-fullscreen-button {
 }
 
 video::-webkit-media-controls-fullscreen-button {
-    display: none;
+    top: 0px;
+    right: 0px;
+    width: 12px;
+    height: 12px;
+    padding: 6px;
+    margin: 5px 5px 5px 3px;
 }
 
 audio::-webkit-media-controls-rewind-button {
diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp
index 8d5cfcd..4804e48 100644
--- a/Source/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQt.cpp
@@ -1174,7 +1174,26 @@ QColor RenderThemeQt::getMediaControlForegroundColor(RenderObject* o) const
 
 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;
 }
 
 bool RenderThemeQt::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)

-- 
WebKit Debian packaging