Changeset 59683 in webkit

Timestamp:

May 18, 2010 12:33:10 PM (14 years ago)

Author:

Adam Roben

Message:

Make WKCACFLayerRenderer robust against temporary failure of Direct3DCreate9 and IDirect3D9::CreateDevice

For a short time after waking from sleep, Direct3DCreate9() will
return an IDirect3D9 for which IDirect3D9::CreateDevice will always
fail. Also during this time period, IDirect3D9::CreateDevice
will fail even for non-bad IDirect3D9s. (It will later start
succeeding.) WKCACFLayerRenderer now works around this behavior by
detecting when it might be in this situation and calling these
functions again later.

Fixes <​http://webkit.org/b/39297> <rdar://problem/7997431> WebView
doesn't repaint until page reloads when page using hardware
acceleration loads just after waking from sleep

Reviewed by John Sullivan.

• manual-tests/crash-and-no-repaint-after-wake-from-sleep.html:

Renamed from WebCore/manual-tests/crash-after-wake-from-sleep.html.
Modified to also include instructions for reproducing this bug.

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): Replaced
m_triedToCreateD3DRenderer with m_mightBeAbleToCreateDeviceLater. The
new member is initialized to true, since we haven't even tried to
create a device once yet.
(WebCore::WKCACFLayerRenderer::createRenderer): If we already have a
D3D device, or we don't have one and are sure that we won't be able to
create one later, just return the previously-created device, if any.
We assume that we won't be able to create a device later if this
function fails, unless the function fails due to CreateDevice failing.
As noted above, CreateDevice will sometimes temporarily fail and then
later start working again. When CreateDevice fails, we also assume
that we might have a bad IDirect3D9, so we get rid of the one we have
so a new (and hopefully non-bad) one will be allocated later.
(WebCore::WKCACFLayerRenderer::destroyRenderer): Reset
m_mightBeAbleToCreateDeviceLater to true, since we no longer have a
device.
(WebCore::WKCACFLayerRenderer::paint): Before trying to paint, try to
create our D3D device and renderer. If this fails, we bail out, but if
we think we might be able to create a device later we schedule another
paint (via renderSoon()) so that we'll try again soon.

• platform/graphics/win/WKCACFLayerRenderer.h: Replaced

m_triedToCreateD3DRenderer with m_mightBeAbleToCreateDeviceLater.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/crash-and-no-repaint-after-wake-from-sleep.html (moved) (moved from trunk/WebCore/manual-tests/crash-after-wake-from-sleep.html) (2 diffs)
• platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (5 diffs)
• platform/graphics/win/WKCACFLayerRenderer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-18  Adam Roben  <aroben@apple.com>
+
+        Make WKCACFLayerRenderer robust against temporary failure of
+        Direct3DCreate9 and IDirect3D9::CreateDevice
+
+        For a short time after waking from sleep, Direct3DCreate9() will
+        return an IDirect3D9 for which IDirect3D9::CreateDevice will always
+        fail. Also during this time period, IDirect3D9::CreateDevice
+        will fail even for non-bad IDirect3D9s. (It will later start
+        succeeding.) WKCACFLayerRenderer now works around this behavior by
+        detecting when it might be in this situation and calling these
+        functions again later.
+
+        Fixes <http://webkit.org/b/39297> <rdar://problem/7997431> WebView
+        doesn't repaint until page reloads when page using hardware
+        acceleration loads just after waking from sleep
+
+        Reviewed by John Sullivan.
+
+        * manual-tests/crash-and-no-repaint-after-wake-from-sleep.html:
+        Renamed from WebCore/manual-tests/crash-after-wake-from-sleep.html.
+        Modified to also include instructions for reproducing this bug.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): Replaced
+        m_triedToCreateD3DRenderer with m_mightBeAbleToCreateDeviceLater. The
+        new member is initialized to true, since we haven't even tried to
+        create a device once yet.
+        (WebCore::WKCACFLayerRenderer::createRenderer): If we already have a
+        D3D device, or we don't have one and are sure that we won't be able to
+        create one later, just return the previously-created device, if any.
+        We assume that we won't be able to create a device later if this
+        function fails, unless the function fails due to CreateDevice failing.
+        As noted above, CreateDevice will sometimes temporarily fail and then
+        later start working again. When CreateDevice fails, we also assume
+        that we might have a bad IDirect3D9, so we get rid of the one we have
+        so a new (and hopefully non-bad) one will be allocated later.
+        (WebCore::WKCACFLayerRenderer::destroyRenderer): Reset
+        m_mightBeAbleToCreateDeviceLater to true, since we no longer have a
+        device.
+        (WebCore::WKCACFLayerRenderer::paint): Before trying to paint, try to
+        create our D3D device and renderer. If this fails, we bail out, but if
+        we think we might be able to create a device later we schedule another
+        paint (via renderSoon()) so that we'll try again soon.
+
+        * platform/graphics/win/WKCACFLayerRenderer.h: Replaced
+        m_triedToCreateD3DRenderer with m_mightBeAbleToCreateDeviceLater.
+
 2010-05-18  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/manual-tests/crash-and-no-repaint-after-wake-from-sleep.html

@@ -3 +3 @@
 <html>
   <head>
-    <title>Test for Bug 39295</title>
+    <title>Test for Bugs 39295 and 39297</title>
     <meta http-equiv="refresh" content="5">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -168 +168 @@
   <body>
 
-    <p>This is a test for <a href="https://bugs.webkit.org/show_bug.cgi?id=39295">Bug 39295: Crash
-    (preceded by assertion) in WKCACFLayerRenderer::setNeedsDisplay when computer wakes from sleep
-    on particular page</a>. To test, put your computer to sleep (or "Standby", as Windows calls it).
-    When you wake your computer up, the browser should not crash.</p>
+    <p>This is a combined test for <a href="https://bugs.webkit.org/show_bug.cgi?id=39295">Bug 39295: Crash (preceded by
+    assertion) in WKCACFLayerRenderer::setNeedsDisplay when computer wakes from sleep on particular page</a> and <a
+    href="https://bugs.webkit.org/show_bug.cgi?id=39297">Bug 39297: WebView doesn't repaint until page reloads when page
+    using hardware acceleration loads just after waking from sleep</a>. To test, put your computer to sleep (or
+    "Standby", as Windows calls it). When you wake your computer up, the browser should not crash and the animation
+    below should still be running without any periods of non-painting of the WebView.</p>
     <div id="stage">
       <div id="rotate">

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

@@ -224 +224 @@
 
 WKCACFLayerRenderer::WKCACFLayerRenderer()
-    : m_triedToCreateD3DRenderer(false)
+    : m_mightBeAbleToCreateDeviceLater(true)
     , m_rootLayer(WKCACFRootLayer::create(this))
     , m_scrollLayer(WKCACFLayer::create(WKCACFLayer::Layer))
@@ -341 +341 @@
 bool WKCACFLayerRenderer::createRenderer()
 {
-    if (m_triedToCreateD3DRenderer)
+    if (m_d3dDevice || !m_mightBeAbleToCreateDeviceLater)
         return m_d3dDevice;
 
-    m_triedToCreateD3DRenderer = true;
+    m_mightBeAbleToCreateDeviceLater = false;
     D3DPRESENT_PARAMETERS parameters = initialPresentationParameters();
 
@@ -362 +362 @@
 
     COMPtr<IDirect3DDevice9> device;
-    if (FAILED(d3d()->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, m_hostWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &parameters, &device)))
-        return false;
+    if (FAILED(d3d()->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, m_hostWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &parameters, &device))) {
+        // In certain situations (e.g., shortly after waking from sleep), Direct3DCreate9() will
+        // return an IDirect3D9 for which IDirect3D9::CreateDevice will always fail. In case we
+        // have one of these bad IDirect3D9s, get rid of it so we'll fetch a new one the next time
+        // we want to call CreateDevice.
+        s_d3d->Release();
+        s_d3d = 0;
+
+        // Even if we don't have a bad IDirect3D9, in certain situations (e.g., shortly after
+        // waking from sleep), CreateDevice will fail, but will later succeed if called again.
+        m_mightBeAbleToCreateDeviceLater = true;
+
+        return false;
+    }
 
     // Now that we've created the IDirect3DDevice9 based on the capabilities we
@@ -412 +424 @@
     m_rootChildLayer = 0;
 
-    m_triedToCreateD3DRenderer = false;
+    m_mightBeAbleToCreateDeviceLater = true;
 }
 
@@ -470 +482 @@
 void WKCACFLayerRenderer::paint()
 {
-    if (!m_d3dDevice)
-        return;
+    createRenderer();
+    if (!m_d3dDevice) {
+        if (m_mightBeAbleToCreateDeviceLater)
+            renderSoon();
+        return;
+    }
 
     if (m_backingStoreDirty) {

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

@@ -95 +95 @@
     void paint();
 
-    bool m_triedToCreateD3DRenderer;
+    bool m_mightBeAbleToCreateDeviceLater;
     COMPtr<IDirect3DDevice9> m_d3dDevice;
     RefPtr<WKCACFRootLayer> m_rootLayer;