Title: [98176] branches/safari-534.52-branch/Source/WebCore
- Revision
- 98176
- Author
- lforsch...@apple.com
- Date
- 2011-10-21 17:39:56 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r98112.
Modified Paths
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98175 => 98176)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-22 00:38:14 UTC (rev 98175)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-22 00:39:56 UTC (rev 98176)
@@ -1,5 +1,16 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 98112
+
+ 2011-10-21 Simon Fraser <simon.fra...@apple.com>
+
+ Fix Windows build.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
+
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 98027
2011-10-20 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (98175 => 98176)
--- branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-22 00:38:14 UTC (rev 98175)
+++ branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-22 00:39:56 UTC (rev 98176)
@@ -240,7 +240,7 @@
bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const
{
- return m_compositedLayerCount > rootLayer->isComposited();
+ return m_compositedLayerCount > (rootLayer->isComposited() ? 1 : 0);
}
void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
