Merge 77599 - 2011-02-03 Victoria Kirst <vrk@google.com>...

Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "WebMediaPlayerClientImpl.h"
 
 #if ENABLE(VIDEO)
 
 #include "Frame.h"
@@ skipping 379 matching lines @@
 }
 
 void WebMediaPlayerClientImpl::setSize(const IntSize& size)
 {
     if (m_webMediaPlayer.get())
         m_webMediaPlayer->setSize(WebSize(size.width(), size.height()));
 }
 
 void WebMediaPlayerClientImpl::paint(GraphicsContext* context, const IntRect& rect)
 {
+#if USE(ACCELERATED_COMPOSITING)
+    // If we are using GPU to render video, ignore requests to paint frames into
+    // canvas because it will be taken care of by VideoLayerChromium.
+    if (acceleratedRenderingInUse())
+        return;
+#endif
+    paintCurrentFrameInContext(context, rect);
+}
+
+void WebMediaPlayerClientImpl::paintCurrentFrameInContext(GraphicsContext* context, const IntRect& rect)
+{
     // Normally GraphicsContext operations do nothing when painting is disabled.
     // Since we're accessing platformContext() directly we have to manually
     // check.
     if (m_webMediaPlayer.get() && !context->paintingDisabled()) {
 #if WEBKIT_USING_SKIA
         PlatformGraphicsContext* platformContext = context->platformContext();
         WebCanvas* canvas = platformContext->canvas();
 
         canvas->saveLayerAlpha(0, platformContext->getNormalizedAlpha());
 
@@ skipping 28 matching lines @@
             m_webMediaPlayer->movieLoadType());
     return MediaPlayer::Unknown;
 }
 
 #if USE(ACCELERATED_COMPOSITING)
 bool WebMediaPlayerClientImpl::supportsAcceleratedRendering() const
 {
     return m_supportsAcceleratedCompositing;
 }
 
+bool WebMediaPlayerClientImpl::acceleratedRenderingInUse()
+{
+    return m_videoLayer.get() && m_videoLayer->layerRenderer();
+}
+
 VideoFrameChromium* WebMediaPlayerClientImpl::getCurrentFrame()
 {
     VideoFrameChromium* videoFrame = 0;
     if (m_webMediaPlayer.get()) {
         WebVideoFrame* webkitVideoFrame = m_webMediaPlayer->getCurrentFrame();
         if (webkitVideoFrame)
             videoFrame = new VideoFrameChromiumImpl(webkitVideoFrame);
     }
     return videoFrame;
 }
@@ skipping 60 matching lines @@
 #if USE(ACCELERATED_COMPOSITING)
     , m_videoLayer(0)
     , m_supportsAcceleratedCompositing(false)
 #endif
 {
 }
 
 } // namespace WebKit
 
 #endif  // ENABLE(VIDEO)