Title: [98153] trunk/Source/WebKit2
- Revision
- 98153
- Author
- a...@apple.com
- Date
- 2011-10-21 14:26:15 -0700 (Fri, 21 Oct 2011)
Log Message
[WK2] Crash after printing a view with accelerated compositing content
https://bugs.webkit.org/show_bug.cgi?id=70643
<rdar://problem/9479083>
Reviewed by Darin Adler.
* UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]):
We cannot rely on -[WKView drawRect:] calling endPrinting() for us. That call to endPrinting()
is still necessary to paint e.g. when resizing a window while a print dialog is present.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98152 => 98153)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 21:22:50 UTC (rev 98152)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 21:26:15 UTC (rev 98153)
@@ -1,3 +1,15 @@
+2011-10-21 Alexey Proskuryakov <a...@apple.com>
+
+ [WK2] Crash after printing a view with accelerated compositing content
+ https://bugs.webkit.org/show_bug.cgi?id=70643
+ <rdar://problem/9479083>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]):
+ We cannot rely on -[WKView drawRect:] calling endPrinting() for us. That call to endPrinting()
+ is still necessary to paint e.g. when resizing a window while a print dialog is present.
+
2011-10-21 Jesus Sanchez-Palencia <jesus.palen...@openbossa.org>
[WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (98152 => 98153)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-21 21:22:50 UTC (rev 98152)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-21 21:26:15 UTC (rev 98153)
@@ -91,6 +91,9 @@
_autodisplayResumeTimer = nil;
[self _setAutodisplay:YES];
+
+ // Enabling autodisplay normally implicitly calls endPrinting() via -[WKView drawRect:], but not when content is in accelerated compositing mode.
+ _webFrame->page()->endPrinting();
}
- (void)_delayedResumeAutodisplay
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
