Title: [98526] trunk/Source/WebKit2
- Revision
- 98526
- Author
- a...@apple.com
- Date
- 2011-10-26 17:20:38 -0700 (Wed, 26 Oct 2011)
Log Message
REGRESSION (r98153): Safari crashes if WebProcess crashed during printing
https://bugs.webkit.org/show_bug.cgi?id=70982
Reviewed by Dan Bernstein.
* UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]):
Null check page, it may be invalid already.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98525 => 98526)
--- trunk/Source/WebKit2/ChangeLog 2011-10-27 00:19:31 UTC (rev 98525)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-27 00:20:38 UTC (rev 98526)
@@ -1,3 +1,13 @@
+2011-10-26 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r98153): Safari crashes if WebProcess crashed during printing
+ https://bugs.webkit.org/show_bug.cgi?id=70982
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]):
+ Null check page, it may be invalid already.
+
2011-10-26 Jeff Miller <je...@apple.com>
WebKit2 should respect secret WebKitOmitPDFSupport preference on the Mac
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (98525 => 98526)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-27 00:19:31 UTC (rev 98525)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-27 00:20:38 UTC (rev 98526)
@@ -93,7 +93,8 @@
[self _setAutodisplay:YES];
// Enabling autodisplay normally implicitly calls endPrinting() via -[WKView drawRect:], but not when content is in accelerated compositing mode.
- _webFrame->page()->endPrinting();
+ if (_webFrame->page())
+ _webFrame->page()->endPrinting();
}
- (void)_delayedResumeAutodisplay
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
