Title: [98468] branches/safari-534.52-branch/Source/WebKit2
- Revision
- 98468
- Author
- lforsch...@apple.com
- Date
- 2011-10-26 06:03:27 -0700 (Wed, 26 Oct 2011)
Log Message
Merged r98153.
Modified Paths
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98467 => 98468)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-26 13:01:52 UTC (rev 98467)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-26 13:03:27 UTC (rev 98468)
@@ -1,5 +1,21 @@
2011-10-26 Lucas Forschler <lforsch...@apple.com>
+ Merge 98153
+
+ 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-26 Lucas Forschler <lforsch...@apple.com>
+
Merge 98113
2011-10-21 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (98467 => 98468)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-26 13:01:52 UTC (rev 98467)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-26 13:03:27 UTC (rev 98468)
@@ -90,6 +90,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
