Title: [221845] trunk/Source/WebCore
- Revision
- 221845
- Author
- fred.w...@free.fr
- Date
- 2017-09-10 22:50:21 -0700 (Sun, 10 Sep 2017)
Log Message
Make RenderLayerCompositor always use isRootLayer()
https://bugs.webkit.org/show_bug.cgi?id=176591
Patch by Frederic Wang <fw...@igalia.coml> on 2017-09-10
Reviewed by Darin Adler.
RenderLayerCompositor contains a few comparisons of the form &layer == m_renderView.layer().
This patch replaces them with "layer.isRootLayer()" which simply verifies that "layer" is
associated to the one (and only one) RenderView of the RenderLayerCompositor. It makes things
more readable and more consistent with the rest of the file.
No new tests, behavior unchanged.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::repaintInCompositedAncestor):
(WebCore::RenderLayerCompositor::needsFixedRootBackgroundLayer const):
(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (221844 => 221845)
--- trunk/Source/WebCore/ChangeLog 2017-09-11 04:49:29 UTC (rev 221844)
+++ trunk/Source/WebCore/ChangeLog 2017-09-11 05:50:21 UTC (rev 221845)
@@ -1,3 +1,22 @@
+2017-09-10 Frederic Wang <fw...@igalia.coml>
+
+ Make RenderLayerCompositor always use isRootLayer()
+ https://bugs.webkit.org/show_bug.cgi?id=176591
+
+ Reviewed by Darin Adler.
+
+ RenderLayerCompositor contains a few comparisons of the form &layer == m_renderView.layer().
+ This patch replaces them with "layer.isRootLayer()" which simply verifies that "layer" is
+ associated to the one (and only one) RenderView of the RenderLayerCompositor. It makes things
+ more readable and more consistent with the rest of the file.
+
+ No new tests, behavior unchanged.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::repaintInCompositedAncestor):
+ (WebCore::RenderLayerCompositor::needsFixedRootBackgroundLayer const):
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
+
2017-09-09 Sam Weinig <s...@webkit.org>
Finish off the FormData implementation
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (221844 => 221845)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-09-11 04:49:29 UTC (rev 221844)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-09-11 05:50:21 UTC (rev 221845)
@@ -1143,16 +1143,17 @@
void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer& layer, const LayoutRect& rect)
{
RenderLayer* compositedAncestor = layer.enclosingCompositingLayerForRepaint(ExcludeSelf);
- if (compositedAncestor) {
- ASSERT(compositedAncestor->backing());
- LayoutRect repaintRect = rect;
- repaintRect.move(layer.offsetFromAncestor(compositedAncestor));
- compositedAncestor->setBackingNeedsRepaintInRect(repaintRect);
- }
+ if (!compositedAncestor)
+ return;
+ ASSERT(compositedAncestor->backing());
+ LayoutRect repaintRect = rect;
+ repaintRect.move(layer.offsetFromAncestor(compositedAncestor));
+ compositedAncestor->setBackingNeedsRepaintInRect(repaintRect);
+
// The contents of this layer may be moving from a GraphicsLayer to the window,
// so we need to make sure the window system synchronizes those changes on the screen.
- if (compositedAncestor == m_renderView.layer())
+ if (compositedAncestor->isRootLayer())
m_renderView.frameView().setNeedsOneShotDrawingSynchronization();
}
@@ -2921,7 +2922,7 @@
bool RenderLayerCompositor::needsFixedRootBackgroundLayer(const RenderLayer& layer) const
{
- if (&layer != m_renderView.layer())
+ if (!layer.isRootLayer())
return false;
if (m_renderView.settings().fixedBackgroundsPaintRelativeToDocument())
@@ -3892,7 +3893,7 @@
if (!scrollingCoordinator || !scrollingCoordinator->coordinatesScrollingForFrameView(m_renderView.frameView()))
return;
- bool isRootLayer = &layer == m_renderView.layer();
+ bool isRootLayer = layer.isRootLayer();
if (!layer.parent() && !isRootLayer)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
