Title: [112491] trunk/Source/WebKit2
- Revision
- 112491
- Author
- [email protected]
- Date
- 2012-03-28 18:50:06 -0700 (Wed, 28 Mar 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (112490 => 112491)
--- trunk/Source/WebKit2/ChangeLog 2012-03-29 01:46:06 UTC (rev 112490)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-29 01:50:06 UTC (rev 112491)
@@ -1,3 +1,18 @@
+2012-03-28 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Remove dispatchDidLoadMainResource callback, since no
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (112490 => 112491)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-03-29 01:46:06 UTC (rev 112490)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-03-29 01:50:06 UTC (rev 112491)
@@ -2216,6 +2216,9 @@
- (void)_processDidCrash
{
+ if (_data->_layerHostingView)
+ [self _exitAcceleratedCompositingMode];
+
[self _updateRemoteAccessibilityRegistration:NO];
}
@@ -2924,7 +2927,9 @@
- (void)updateLayer
{
self.layer.backgroundColor = CGColorGetConstantColor(kCGColorWhite);
- _data->_page->drawingArea()->waitForPossibleGeometryUpdate();
+
+ if (DrawingAreaProxy* drawingArea = _data->_page->drawingArea())
+ drawingArea->waitForPossibleGeometryUpdate();
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
