Title: [87649] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87648 => 87649)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-29 20:56:00 UTC (rev 87648)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-29 20:57:26 UTC (rev 87649)
@@ -1,5 +1,24 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87637.
+
+ 2011-05-29 Darin Adler <[email protected]>
+
+ Reviewed by Anders Carlsson and Simon Fraser.
+
+ <rdar://problem/9519453>
+ When calling ForceRepaint on a page with accelerated compositing, we can get
+ a race condition where the UI process paints the old content, resulting in showing
+ the previous page. That happens because forceRepaint's callback waits for the next
+ repaint to happen, but nothing notifies UI process that the page is in accelerated
+ compositing mode.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::forceRepaint): Call layerHostDidFlushLayers instead of
+ just calling forceRepaint on the layer tree host.
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87638.
2011-05-29 Beth Dakin <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (87648 => 87649)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-29 20:56:00 UTC (rev 87648)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-29 20:57:26 UTC (rev 87649)
@@ -156,7 +156,10 @@
m_webPage->layoutIfNeeded();
if (m_layerTreeHost) {
- m_layerTreeHost->forceRepaint();
+ // FIXME: We need to do the same work as the layerHostDidFlushLayers function here,
+ // but clearly it doesn't make sense to call the function with that name.
+ // Consider renaming it.
+ layerHostDidFlushLayers();
if (!m_layerTreeHost->participatesInDisplay())
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
