Merge 90185 - 2011-06-30 John Bates <jbates@google.com>

Source/WebKit/chromium/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1126 matching lines @@
     page()->mainFrame()->view()->syncCompositingStateIncludingSubframes();
 
     TRACE_EVENT("WebViewImpl::composite", this, 0);
     if (m_recreatingGraphicsContext) {
         // reallocateRenderer will request a repaint whether or not it succeeded
         // in creating a new context.
         reallocateRenderer();
         m_recreatingGraphicsContext = false;
         return;
     }
-    doComposite();
 
-    // Finish if requested.
-    if (finish)
-        m_layerRenderer->finish();
+    // Do not composite if the compositor context is already lost.
+    if (!m_layerRenderer->isCompositorContextLost()) {
+        doComposite();
 
-    // Put result onscreen.
-    m_layerRenderer->present();
+        // Finish if requested.
+        if (finish)
+            m_layerRenderer->finish();
+
+        // Put result onscreen.
+        m_layerRenderer->present();
+    }
 
     if (m_layerRenderer->isCompositorContextLost()) {
         // Trying to recover the context right here will not work if GPU process
         // died. This is because GpuChannelHost::OnErrorMessage will only be
         // called at the next iteration of the message loop, reverting our
         // recovery attempts here. Instead, we detach the root layer from the
         // renderer, recreate the renderer at the next message loop iteration
         // and request a repaint yet again.
         m_recreatingGraphicsContext = true;
         setRootLayerNeedsDisplay();
@@ skipping 1417 matching lines @@
         return;
 
     ASSERT(visibilityState == WebPageVisibilityStateVisible
            || visibilityState == WebPageVisibilityStateHidden
            || visibilityState == WebPageVisibilityStatePrerender);
     m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 #endif
 }
 
 } // namespace WebKit