Changeset 106986 in webkit

Timestamp:

Feb 7, 2012 1:50:57 PM (12 years ago)

Author:

jamesr@google.com

Message:

[chromium] Gracefully handle compositor initialization failure in single-threaded proxy
​https://bugs.webkit.org/show_bug.cgi?id=78013

Reviewed by Kenneth Russell.

If compositor initialization fails it's not safe to proceed through the rest of the frame process. This adds
some early outs.

Tested manually by forcing the first makeContextCurrent() call fail.

• platform/graphics/chromium/cc/CCLayerTreeHost.cpp:

(WebCore::CCLayerTreeHost::updateLayers):

• platform/graphics/chromium/cc/CCLayerTreeHost.h:

(CCLayerTreeHost):

• platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:

(WebCore::CCSingleThreadProxy::compositeAndReadback):
(WebCore::CCSingleThreadProxy::compositeImmediately):
(WebCore::CCSingleThreadProxy::commitIfNeeded):

• platform/graphics/chromium/cc/CCSingleThreadProxy.h:

(CCSingleThreadProxy):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/cc/CCLayerTreeHost.cpp (modified) (2 diffs)
• platform/graphics/chromium/cc/CCLayerTreeHost.h (modified) (1 diff)
• platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (modified) (3 diffs)
• platform/graphics/chromium/cc/CCSingleThreadProxy.h (modified) (1 diff)
• platform/graphics/chromium/cc/CCThreadProxy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Gracefully handle compositor initialization failure in single-threaded proxy
+        https://bugs.webkit.org/show_bug.cgi?id=78013
+
+        Reviewed by Kenneth Russell.
+
+        If compositor initialization fails it's not safe to proceed through the rest of the frame process. This adds
+        some early outs.
+
+        Tested manually by forcing the first makeContextCurrent() call fail.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::updateLayers):
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        (CCLayerTreeHost):
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+        (WebCore::CCSingleThreadProxy::compositeAndReadback):
+        (WebCore::CCSingleThreadProxy::compositeImmediately):
+        (WebCore::CCSingleThreadProxy::commitIfNeeded):
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
+        (CCSingleThreadProxy):
+
 2012-02-07  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

@@ -372 +372 @@
 }
 
-void CCLayerTreeHost::updateLayers()
+bool CCLayerTreeHost::updateLayers()
 {
     if (!m_layerRendererInitialized) {
@@ -378 +378 @@
         // If we couldn't initialize, then bail since we're returning to software mode.
         if (!m_layerRendererInitialized)
-            return;
+            return false;
     }
 
     if (!rootLayer())
-        return;
+        return true;
 
     if (viewportSize().isEmpty())
-        return;
+        return true;
 
     updateLayers(rootLayer());
+    return true;
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

@@ -185 +185 @@
     void setHaveWheelEventHandlers(bool);
 
-    void updateLayers();
+    // Returns false if we should abort this frame due to initialization failure.
+    bool updateLayers();
 
     void updateCompositorResources(GraphicsContext3D*, CCTextureUpdater&);

trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

@@ -79 +79 @@
     }
 
-    commitIfNeeded();
+    if (!commitIfNeeded())
+        return false;
 
     if (!doComposite())
@@ -229 +230 @@
         return;
 
-    commitIfNeeded();
+    if (!commitIfNeeded())
+        return;
 
     if (doComposite())
@@ -283 +285 @@
 }
 
-void CCSingleThreadProxy::commitIfNeeded()
-{
-    ASSERT(CCProxy::isMainThread());
-
-    m_layerTreeHost->updateLayers();
+bool CCSingleThreadProxy::commitIfNeeded()
+{
+    ASSERT(CCProxy::isMainThread());
+
+    if (!m_layerTreeHost->updateLayers())
+        return false;
 
     doCommit();
+    return true;
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h

@@ -69 +69 @@
     explicit CCSingleThreadProxy(CCLayerTreeHost*);
     bool recreateContextIfNeeded();
-    void commitIfNeeded();
+    bool commitIfNeeded();
     void doCommit();
     bool doComposite();

trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp

@@ -398 +398 @@
     m_commitRequested = false;
 
-    m_layerTreeHost->updateLayers();
+    if (!m_layerTreeHost->updateLayers())
+        return;
 
     // Before applying scrolls and calling animate, we set m_animateRequested to false.