Changeset 90185 in webkit

Timestamp:

Jun 30, 2011 4:46:54 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by James Robinson.

Chromium bug: Compositing on a lost context causes latch deadlocks.
The cause of deadlock was that a setLatch command is added to the lost
compositor GL context, and a waitLatch would never complete on a child context.
This change checks whether the compositor context is in error state before
doing the compositing.
​https://bugs.webkit.org/show_bug.cgi?id=63681

• src/WebViewImpl.cpp: (WebKit::WebViewImpl::composite):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-30  John Bates  <jbates@google.com>
+
+        Reviewed by James Robinson.
+
+        Chromium bug: Compositing on a lost context causes latch deadlocks.
+        The cause of deadlock was that a setLatch command is added to the lost
+        compositor GL context, and a waitLatch would never complete on a child context.
+        This change checks whether the compositor context is in error state before
+        doing the compositing.
+        https://bugs.webkit.org/show_bug.cgi?id=63681
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::composite):
+
 2011-06-30  Cary Clark  <caryclark@google.com>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1168 +1168 @@
         return;
     }
-    doComposite();
-
-    // Put result onscreen.
-    m_layerRenderer->present();
+
+    // Do not composite if the compositor context is already lost.
+    if (!m_layerRenderer->isCompositorContextLost()) {
+        doComposite();
+
+        // Put result onscreen.
+        m_layerRenderer->present();
+    }
 
     if (m_layerRenderer->isCompositorContextLost()) {