Title: [87667] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87666 => 87667)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-30 04:34:15 UTC (rev 87666)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-30 04:40:19 UTC (rev 87667)
@@ -1,5 +1,22 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87642.
+
+ 2011-05-29 Anders Carlsson <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (87637): Entering WebKit Full Screen mode causes an assertion in DrawingAreaImpl::layerHostDidFlushLayers
+ https://bugs.webkit.org/show_bug.cgi?id=61706
+ <rdar://problem/9521970>
+
+ If we've already let the UI process know that we're in compositing mode, we just need to force a repaint.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::forceRepaint):
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87652.
2011-05-29 Jer Noble <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (87666 => 87667)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-30 04:34:15 UTC (rev 87666)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-30 04:40:19 UTC (rev 87667)
@@ -158,8 +158,11 @@
if (m_layerTreeHost) {
// 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();
+ // Consider refactoring and renaming it.
+ if (m_compositingAccordingToProxyMessages)
+ m_layerTreeHost->forceRepaint();
+ else
+ layerHostDidFlushLayers();
if (!m_layerTreeHost->participatesInDisplay())
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
