Changeset 59682 in webkit

Timestamp:

May 18, 2010 12:32:46 PM (14 years ago)

Author:

Adam Roben

Message:

Fix a crash when a page that uses accelerated compositing loads soon after the computer wakes from sleep

The set-up:

For a short time after waking from sleep, IDirect3D9::CreateDevice
will fail. This caused WKCACFLayerRenderer::createRenderer to fail,
and meant that WKCACFLayerRenderer never allocated a root layer.
WebView wouldn't notice that createRenderer failed, and would go ahead
and try to use the root layer anyway, resulting in a crash.

The fix:

We now allocate the root layer (and all the other members of
WKCACFLayerRenderer that aren't dependent on having an
IDirect3DDevice9) in WKCACFLayerRenderer's constructor. This way the
layers will always be present, even when creating the D3D device
fails.

There are two remaining problems:

1) This results in slightly more memory usage in the case where

CreateDevice fails.

2) Once we get into this bad state, the WebView doesn't repaint

until we navigate somewhere else.

(2) is covered by
<​http://webkit.org/b/39297>/<rdar://problem/7997431>. We'll fix it by
retrying CreateDevice later in hopes that it will succeed after more
time has passed. This will in turn fix (1). (We should never end up in
a case where CreateDevice fails forever because we already did some
preliminary checks in acceleratedCompositingAvailable().)

Fixes <​http://webkit.org/b/39295> <rdar://problem/7971319> Crash
(preceded by assertion) in WKCACFLayerRenderer::setNeedsDisplay when
computer wakes from sleep on particular page

Reviewed by John Sullivan.

• manual-tests/crash-after-wake-from-sleep.html: Added. This

is the Poster Circle demo from webkit.org/blog, but modified to
automatically reload every 5 seconds and with instructions to put the
computer to sleep and wake it up again.

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): Moved code to
initialize m_context, m_renderContext, and m_*Layer here...
(WebCore::WKCACFLayerRenderer::createRenderer): ...from here.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/crash-after-wake-from-sleep.html (added)
• platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-18  Adam Roben  <aroben@apple.com>
+
+        Fix a crash when a page that uses accelerated compositing loads soon
+        after the computer wakes from sleep
+
+        The set-up:
+
+        For a short time after waking from sleep, IDirect3D9::CreateDevice
+        will fail. This caused WKCACFLayerRenderer::createRenderer to fail,
+        and meant that WKCACFLayerRenderer never allocated a root layer.
+        WebView wouldn't notice that createRenderer failed, and would go ahead
+        and try to use the root layer anyway, resulting in a crash.
+
+        The fix:
+
+        We now allocate the root layer (and all the other members of
+        WKCACFLayerRenderer that aren't dependent on having an
+        IDirect3DDevice9) in WKCACFLayerRenderer's constructor. This way the
+        layers will always be present, even when creating the D3D device
+        fails.
+
+        There are two remaining problems:
+          1) This results in slightly more memory usage in the case where
+             CreateDevice fails.
+          2) Once we get into this bad state, the WebView doesn't repaint
+             until we navigate somewhere else.
+
+        (2) is covered by
+        <http://webkit.org/b/39297>/<rdar://problem/7997431>. We'll fix it by
+        retrying CreateDevice later in hopes that it will succeed after more
+        time has passed. This will in turn fix (1). (We should never end up in
+        a case where CreateDevice fails forever because we already did some
+        preliminary checks in acceleratedCompositingAvailable().)
+
+        Fixes <http://webkit.org/b/39295> <rdar://problem/7971319> Crash
+        (preceded by assertion) in WKCACFLayerRenderer::setNeedsDisplay when
+        computer wakes from sleep on particular page
+
+        Reviewed by John Sullivan.
+
+        * manual-tests/crash-after-wake-from-sleep.html: Added. This
+        is the Poster Circle demo from webkit.org/blog, but modified to
+        automatically reload every 5 seconds and with instructions to put the
+        computer to sleep and wake it up again.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): Moved code to
+        initialize m_context, m_renderContext, and m_*Layer here...
+        (WebCore::WKCACFLayerRenderer::createRenderer): ...from here.
+
 2010-05-18  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp

@@ -225 +225 @@
 WKCACFLayerRenderer::WKCACFLayerRenderer()
     : m_triedToCreateD3DRenderer(false)
-    , m_renderContext(0)
+    , m_rootLayer(WKCACFRootLayer::create(this))
+    , m_scrollLayer(WKCACFLayer::create(WKCACFLayer::Layer))
+    , m_clipLayer(WKCACFLayer::create(WKCACFLayer::Layer))
+    , m_context(AdoptCF, CACFContextCreate(0))
+    , m_renderContext(static_cast<CARenderContext*>(CACFContextGetRenderContext(m_context.get())))
     , m_renderer(0)
     , m_hostWindow(0)
@@ -234 +238 @@
     , m_mustResetLostDeviceBeforeRendering(false)
 {
-#ifndef NDEBUG
-    char* printTreeFlag = getenv("CA_PRINT_TREE");
-    m_printTree = printTreeFlag && atoi(printTreeFlag);
-#endif
-}
-
-WKCACFLayerRenderer::~WKCACFLayerRenderer()
-{
-    destroyRenderer();
-}
-
-WKCACFLayer* WKCACFLayerRenderer::rootLayer() const
-{
-    return m_rootLayer.get();
-}
-
-void WKCACFLayerRenderer::setScrollFrame(const IntPoint& position, const IntSize& size)
-{
-    m_scrollSize = size;
-    m_scrollPosition = position;
-
-    updateScrollFrame();
-}
-
-void WKCACFLayerRenderer::updateScrollFrame()
-{
-    CGRect frameBounds = bounds();
-    m_clipLayer->setBounds(CGRectMake(0, 0, m_scrollSize.width(), m_scrollSize.height()));
-    m_clipLayer->setPosition(CGPointMake(0, frameBounds.size.height));
-    if (m_rootChildLayer) {
-        CGRect rootBounds = m_rootChildLayer->bounds();
-        m_scrollLayer->setBounds(rootBounds);
-    }
-    m_scrollLayer->setPosition(CGPointMake(-m_scrollPosition.x(), m_scrollPosition.y() + m_scrollSize.height()));
-}
-
-void WKCACFLayerRenderer::setRootContents(CGImageRef image)
-{
-    ASSERT(m_rootLayer);
-    m_rootLayer->setContents(image);
-    renderSoon();
-}
-
-void WKCACFLayerRenderer::setRootContentsAndDisplay(CGImageRef image)
-{
-    ASSERT(m_rootLayer);
-    m_rootLayer->setContents(image);
-    paint();
-}
-
-void WKCACFLayerRenderer::setRootChildLayer(WKCACFLayer* layer)
-{
-    if (!m_scrollLayer)
-        return;
-
-    m_scrollLayer->removeAllSublayers();
-    m_rootChildLayer = layer;
-    if (layer) {
-        m_scrollLayer->addSublayer(layer);
-        // Adjust the scroll frame accordingly
-        updateScrollFrame();
-    }
-}
-   
-void WKCACFLayerRenderer::setNeedsDisplay()
-{
-    ASSERT(m_rootLayer);
-    m_rootLayer->setNeedsDisplay(0);
-    renderSoon();
-}
-
-bool WKCACFLayerRenderer::createRenderer()
-{
-    if (m_triedToCreateD3DRenderer)
-        return m_d3dDevice;
-
-    m_triedToCreateD3DRenderer = true;
-    D3DPRESENT_PARAMETERS parameters = initialPresentationParameters();
-
-    if (!d3d() || !::IsWindow(m_hostWindow))
-        return false;
-
-    // D3D doesn't like to make back buffers for 0 size windows. We skirt this problem if we make the
-    // passed backbuffer width and height non-zero. The window will necessarily get set to a non-zero
-    // size eventually, and then the backbuffer size will get reset.
-    RECT rect;
-    GetClientRect(m_hostWindow, &rect);
-
-    if (rect.left-rect.right == 0 || rect.bottom-rect.top == 0) {
-        parameters.BackBufferWidth = 1;
-        parameters.BackBufferHeight = 1;
-    }
-
-    COMPtr<IDirect3DDevice9> device;
-    if (FAILED(d3d()->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, m_hostWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &parameters, &device)))
-        return false;
-
-    // Now that we've created the IDirect3DDevice9 based on the capabilities we
-    // got from the IDirect3D9 global object, we requery the device for its
-    // actual capabilities. The capabilities returned by the device can
-    // sometimes be more complete, for example when using software vertex
-    // processing.
-    D3DCAPS9 deviceCaps;
-    if (FAILED(device->GetDeviceCaps(&deviceCaps)))
-        return false;
-
-    if (!hardwareCapabilitiesIndicateCoreAnimationSupport(deviceCaps))
-        return false;
-
-    m_d3dDevice = device;
-
-    D3DXMATRIXA16 projection;
-    D3DXMatrixOrthoOffCenterRH(&projection, rect.left, rect.right, rect.top, rect.bottom, -1.0f, 1.0f);
-
-    m_d3dDevice->SetTransform(D3DTS_PROJECTION, &projection);
-
-    m_context.adoptCF(CACFContextCreate(0));
     windowsForContexts().set(m_context.get(), this);
 
-    m_renderContext = static_cast<CARenderContext*>(CACFContextGetRenderContext(m_context.get()));
-    m_renderer = CARenderOGLNew(&kCARenderDX9Callbacks, m_d3dDevice.get(), 0);
-
-    // Create the root hierarchy.
     // Under the root layer, we have a clipping layer to clip the content,
     // that contains a scroll layer that we use for scrolling the content.
@@ -366 +249 @@
     // Scrolling will affect only the position of the scroll layer without affecting the bounds.
 
-    m_rootLayer = WKCACFRootLayer::create(this);
     m_rootLayer->setName("WKCACFLayerRenderer rootLayer");
-
-    m_clipLayer = WKCACFLayer::create(WKCACFLayer::Layer);
     m_clipLayer->setName("WKCACFLayerRenderer clipLayer");
-    
-    m_scrollLayer = WKCACFLayer::create(WKCACFLayer::Layer);
     m_scrollLayer->setName("WKCACFLayerRenderer scrollLayer");
 
@@ -387 +265 @@
 #endif
 
+    if (m_context)
+        m_rootLayer->becomeRootLayerForContext(m_context.get());
+
+#ifndef NDEBUG
+    char* printTreeFlag = getenv("CA_PRINT_TREE");
+    m_printTree = printTreeFlag && atoi(printTreeFlag);
+#endif
+}
+
+WKCACFLayerRenderer::~WKCACFLayerRenderer()
+{
+    destroyRenderer();
+}
+
+WKCACFLayer* WKCACFLayerRenderer::rootLayer() const
+{
+    return m_rootLayer.get();
+}
+
+void WKCACFLayerRenderer::setScrollFrame(const IntPoint& position, const IntSize& size)
+{
+    m_scrollSize = size;
+    m_scrollPosition = position;
+
+    updateScrollFrame();
+}
+
+void WKCACFLayerRenderer::updateScrollFrame()
+{
+    CGRect frameBounds = bounds();
+    m_clipLayer->setBounds(CGRectMake(0, 0, m_scrollSize.width(), m_scrollSize.height()));
+    m_clipLayer->setPosition(CGPointMake(0, frameBounds.size.height));
+    if (m_rootChildLayer) {
+        CGRect rootBounds = m_rootChildLayer->bounds();
+        m_scrollLayer->setBounds(rootBounds);
+    }
+    m_scrollLayer->setPosition(CGPointMake(-m_scrollPosition.x(), m_scrollPosition.y() + m_scrollSize.height()));
+}
+
+void WKCACFLayerRenderer::setRootContents(CGImageRef image)
+{
+    ASSERT(m_rootLayer);
+    m_rootLayer->setContents(image);
+    renderSoon();
+}
+
+void WKCACFLayerRenderer::setRootContentsAndDisplay(CGImageRef image)
+{
+    ASSERT(m_rootLayer);
+    m_rootLayer->setContents(image);
+    paint();
+}
+
+void WKCACFLayerRenderer::setRootChildLayer(WKCACFLayer* layer)
+{
+    if (!m_scrollLayer)
+        return;
+
+    m_scrollLayer->removeAllSublayers();
+    m_rootChildLayer = layer;
+    if (layer) {
+        m_scrollLayer->addSublayer(layer);
+        // Adjust the scroll frame accordingly
+        updateScrollFrame();
+    }
+}
+   
+void WKCACFLayerRenderer::setNeedsDisplay()
+{
+    ASSERT(m_rootLayer);
+    m_rootLayer->setNeedsDisplay(0);
+    renderSoon();
+}
+
+bool WKCACFLayerRenderer::createRenderer()
+{
+    if (m_triedToCreateD3DRenderer)
+        return m_d3dDevice;
+
+    m_triedToCreateD3DRenderer = true;
+    D3DPRESENT_PARAMETERS parameters = initialPresentationParameters();
+
+    if (!d3d() || !::IsWindow(m_hostWindow))
+        return false;
+
+    // D3D doesn't like to make back buffers for 0 size windows. We skirt this problem if we make the
+    // passed backbuffer width and height non-zero. The window will necessarily get set to a non-zero
+    // size eventually, and then the backbuffer size will get reset.
+    RECT rect;
+    GetClientRect(m_hostWindow, &rect);
+
+    if (rect.left-rect.right == 0 || rect.bottom-rect.top == 0) {
+        parameters.BackBufferWidth = 1;
+        parameters.BackBufferHeight = 1;
+    }
+
+    COMPtr<IDirect3DDevice9> device;
+    if (FAILED(d3d()->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, m_hostWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &parameters, &device)))
+        return false;
+
+    // Now that we've created the IDirect3DDevice9 based on the capabilities we
+    // got from the IDirect3D9 global object, we requery the device for its
+    // actual capabilities. The capabilities returned by the device can
+    // sometimes be more complete, for example when using software vertex
+    // processing.
+    D3DCAPS9 deviceCaps;
+    if (FAILED(device->GetDeviceCaps(&deviceCaps)))
+        return false;
+
+    if (!hardwareCapabilitiesIndicateCoreAnimationSupport(deviceCaps))
+        return false;
+
+    m_d3dDevice = device;
+
+    D3DXMATRIXA16 projection;
+    D3DXMatrixOrthoOffCenterRH(&projection, rect.left, rect.right, rect.top, rect.bottom, -1.0f, 1.0f);
+
+    m_d3dDevice->SetTransform(D3DTS_PROJECTION, &projection);
+
+    m_renderer = CARenderOGLNew(&kCARenderDX9Callbacks, m_d3dDevice.get(), 0);
+
     if (IsWindow(m_hostWindow))
         m_rootLayer->setFrame(bounds());
-
-    if (m_context)
-        m_rootLayer->becomeRootLayerForContext(m_context.get());
 
     return true;