Changeset 77759 in webkit

Timestamp:

Feb 5, 2011 9:24:27 PM (13 years ago)

Author:

mjs@apple.com

Message:

2011-02-05 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Dan Bernstein.

REGRESSION: New drawing area is causing some WebProcess crashes in layout tests
​https://bugs.webkit.org/show_bug.cgi?id=53865
<rdar://problem/8963148>

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode): Handle the case where this is called repeatedly without exiting accelerated composting mode first. (WebKit::DrawingAreaImpl::exitAcceleratedCompositingMode): Handle the case of being called more than once.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-05  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        REGRESSION: New drawing area is causing some WebProcess crashes in layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=53865
+        <rdar://problem/8963148>
+        
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode): Handle the case
+        where this is called repeatedly without exiting accelerated composting mode
+        first.
+        (WebKit::DrawingAreaImpl::exitAcceleratedCompositingMode): Handle the case
+        of being called more than once.
+
 2011-02-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -235 +235 @@
 void DrawingAreaImpl::enterAcceleratedCompositingMode(GraphicsLayer* graphicsLayer)
 {
-    ASSERT(!m_layerTreeHost);
+    if (m_layerTreeHost)
+        m_layerTreeHost->invalidate();
 
     m_layerTreeHost = LayerTreeHost::create(m_webPage, graphicsLayer);
@@ -252 +253 @@
 void DrawingAreaImpl::exitAcceleratedCompositingMode()
 {
-    m_layerTreeHost->invalidate();
-    m_layerTreeHost = nullptr;
-    
+    if (m_layerTreeHost) {
+        m_layerTreeHost->invalidate();
+        m_layerTreeHost = nullptr;
+    }
+
     if (m_inSetSize)
         return;