Changeset 112491 in webkit

Timestamp:

Mar 28, 2012 6:50:06 PM (12 years ago)

Author:

andersca@apple.com

Message:

Fix a crash and an assertion when recovering from a web process crash
​https://bugs.webkit.org/show_bug.cgi?id=82559
<rdar://problem/10902574>

Reviewed by Mark Rowe.

• UIProcess/API/mac/WKView.mm:

(-[WKView _processDidCrash]):
If we're currently in accelerated compositing mode, exit.

(-[WKView updateLayer]):
Guard against a null drawing area.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-28  Anders Carlsson  <andersca@apple.com>
+
+        Fix a crash and an assertion when recovering from a web process crash
+        https://bugs.webkit.org/show_bug.cgi?id=82559
+        <rdar://problem/10902574>
+
+        Reviewed by Mark Rowe.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _processDidCrash]):
+        If we're currently in accelerated compositing mode, exit.
+
+        (-[WKView updateLayer]):
+        Guard against a null drawing area.
+
 2012-03-28  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -2217 +2217 @@
 - (void)_processDidCrash
 {
+    if (_data->_layerHostingView)
+        [self _exitAcceleratedCompositingMode];
+
     [self _updateRemoteAccessibilityRegistration:NO];
 }
@@ -2925 +2928 @@
 {
     self.layer.backgroundColor = CGColorGetConstantColor(kCGColorWhite);
-    _data->_page->drawingArea()->waitForPossibleGeometryUpdate();
+
+    if (DrawingAreaProxy* drawingArea = _data->_page->drawingArea())
+        drawingArea->waitForPossibleGeometryUpdate();
 }
 #endif