Merge 25125 - Fixes crash when switching to new tabs containing audio/video e...

webkit/api/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 "TemporaryGlue.h"
@@ skipping 308 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 (m_webMediaPlayer.get()) {
+    // 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
         m_webMediaPlayer->paint(context->platformContext()->canvas(), rect);
 #elif WEBKIT_USING_CG
         // If there is no preexisting platform canvas, or if the size has
         // changed, recreate the canvas.  This is to avoid recreating the bitmap
         // buffer over and over for each frame of video.
         if (!m_webCanvas ||
             m_webCanvas->getDevice()->width() != rect.width() ||
             m_webCanvas->getDevice()->height() != rect.height()) {
             m_webCanvas.set(new WebCanvas(rect.width(), rect.height(), true));
@@ skipping 86 matching lines @@
 }
 
 WebMediaPlayerClientImpl::WebMediaPlayerClientImpl()
     : m_mediaPlayer(0)
 {
 }
 
 } // namespace WebKit
 
 #endif  // ENABLE(VIDEO)