Title: [87668] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87667 => 87668)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-30 04:40:19 UTC (rev 87667)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-30 04:41:48 UTC (rev 87668)
@@ -1,5 +1,22 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87654.
+
+ 2011-05-29 Sam Weinig <[email protected]>
+
+ Reviewed by Anders Carlsson.
+
+ REGRESSION (r87637): nytimes.com freezes after going back to it
+ <rdar://problem/9521928>
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::forceRepaint):
+ Add call to setShouldNotifyAfterNextScheduledLayerFlush(false) to prevent a
+ redundant call to layerHostDidFlushLayers which would cause the layer state
+ to get out of sync with the UIProcess.
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87642.
2011-05-29 Anders Carlsson <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (87667 => 87668)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-30 04:40:19 UTC (rev 87667)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-05-30 04:41:48 UTC (rev 87668)
@@ -161,8 +161,12 @@
// Consider refactoring and renaming it.
if (m_compositingAccordingToProxyMessages)
m_layerTreeHost->forceRepaint();
- else
+ else {
+ // Call setShouldNotifyAfterNextScheduledLayerFlush(false) here to
+ // prevent layerHostDidFlushLayers() from being called a second time.
+ m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(false);
layerHostDidFlushLayers();
+ }
if (!m_layerTreeHost->participatesInDisplay())
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
