Title: [96038] branches/safari-534.51-branch/Source/WebCore
- Revision
- 96038
- Author
- mr...@apple.com
- Date
- 2011-09-26 16:38:20 -0700 (Mon, 26 Sep 2011)
Log Message
Merge r95863.
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (96037 => 96038)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-26 23:36:56 UTC (rev 96037)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-26 23:38:20 UTC (rev 96038)
@@ -1,3 +1,25 @@
+2011-09-26 Mark Rowe <mr...@apple.com>
+
+ Merge r95863.
+
+ 2011-09-23 James Robinson <jam...@chromium.org>
+
+ Avoid updating compositing state during paint
+ https://bugs.webkit.org/show_bug.cgi?id=68727
+
+ Reviewed by Simon Fraser.
+
+ We shouldn't update our compositing state in the middle of a paint. The call to
+ updateCompositingAndLayerListsIfNeeded() was added to RenderLayer::paintLayer in r45715, which was intended to
+ fix this exact issue. Based off the ChangeLog entries, I think that this was just a typo.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayer):
+ (WebCore::RenderLayer::updateCompositingAndLayerListsIfNeeded):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateCompositingLayers):
+ * rendering/RenderLayerCompositor.h:
+
2011-09-15 Mark Rowe <mr...@apple.com>
Merge r89705.
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp (96037 => 96038)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-09-26 23:36:56 UTC (rev 96037)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-09-26 23:38:20 UTC (rev 96038)
@@ -2623,7 +2623,7 @@
int ty = y - renderBoxY();
// Ensure our lists are up-to-date.
- updateCompositingAndLayerListsIfNeeded();
+ updateLayerListsIfNeeded();
bool forceBlackText = paintBehavior & PaintBehaviorForceBlackText;
bool selectionOnly = paintBehavior & PaintBehaviorSelectionOnly;
@@ -3923,7 +3923,7 @@
#if USE(ACCELERATED_COMPOSITING)
if (compositor()->inCompositingMode()) {
if ((isStackingContext() && m_zOrderListsDirty) || m_normalFlowListDirty)
- compositor()->updateCompositingLayers(CompositingUpdateOnPaitingOrHitTest, this);
+ compositor()->updateCompositingLayers(CompositingUpdateOnHitTest, this);
return;
}
#endif
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (96037 => 96038)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-09-26 23:36:56 UTC (rev 96037)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-09-26 23:38:20 UTC (rev 96038)
@@ -249,7 +249,7 @@
switch (updateType) {
case CompositingUpdateAfterLayoutOrStyleChange:
- case CompositingUpdateOnPaitingOrHitTest:
+ case CompositingUpdateOnHitTest:
checkForHierarchyUpdate = true;
break;
case CompositingUpdateOnScroll:
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.h (96037 => 96038)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2011-09-26 23:36:56 UTC (rev 96037)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2011-09-26 23:38:20 UTC (rev 96038)
@@ -43,7 +43,7 @@
enum CompositingUpdateType {
CompositingUpdateAfterLayoutOrStyleChange,
- CompositingUpdateOnPaitingOrHitTest,
+ CompositingUpdateOnHitTest,
CompositingUpdateOnScroll
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
