Changeset 77207 in webkit

Timestamp:

Jan 31, 2011 7:46:19 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-31 Kalle Vahlman <​kalle.vahlman@movial.com>

Reviewed by Andreas Kling.

[Qt] canvas.drawImage(HTMLVideoElement) doesn't work with Qt Multimedia backend
​https://bugs.webkit.org/show_bug.cgi?id=53325

Reimplement paintCurrentFrameInContext() rather than delegate the
rendering to paint() to make sure we really do get the video frame
content into the GraphicsContext, regardless of accelerated
compositing and the video scene state.

• platform/graphics/qt/MediaPlayerPrivateQt.cpp: (WebCore::MediaPlayerPrivateQt::paintCurrentFrameInContext):
• platform/graphics/qt/MediaPlayerPrivateQt.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-31  Kalle Vahlman  <kalle.vahlman@movial.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] canvas.drawImage(HTMLVideoElement) doesn't work with Qt Multimedia backend
+        https://bugs.webkit.org/show_bug.cgi?id=53325
+
+        Reimplement paintCurrentFrameInContext() rather than delegate the
+        rendering to paint() to make sure we really do get the video frame
+        content into the GraphicsContext, regardless of accelerated
+        compositing and the video scene state.
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::paintCurrentFrameInContext):
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+
 2011-01-31  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -619 +619 @@
 }
 
+void MediaPlayerPrivateQt::paintCurrentFrameInContext(GraphicsContext* context, const IntRect& rect)
+{
+    if (context->paintingDisabled())
+        return;
+
+    if (!m_isVisible)
+        return;
+
+    // Grab the painter and widget
+    QPainter* painter = context->platformContext();
+
+    // Render the video, using the item as it might not be in the scene
+    m_videoItem->paint(painter, 0, 0);
+}
+
 void MediaPlayerPrivateQt::repaint()
 {

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

@@ -90 +90 @@
 
     void paint(GraphicsContext*, const IntRect&);
+    // reimplemented for canvas drawImage(HTMLVideoElement)
+    void paintCurrentFrameInContext(GraphicsContext*, const IntRect&);
 
     bool supportsFullscreen() const { return true; }