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

webkit/api/src/WebMediaPlayerClientImpl.cpp

Index: webkit/api/src/WebMediaPlayerClientImpl.cpp
===================================================================
--- webkit/api/src/WebMediaPlayerClientImpl.cpp	(revision 25135)
+++ webkit/api/src/WebMediaPlayerClientImpl.cpp	(working copy)
@@ -326,7 +326,10 @@
 
 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
Property changes on: webkit\api\src\WebMediaPlayerClientImpl.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/webkit/api/src/WebMediaPlayerClientImpl.cpp:r25125