Promote inlines to first-class invalidation citizens

Source/core/rendering/PaintInvalidationState.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/rendering/PaintInvalidationState.h"
 
 #include "core/rendering/RenderInline.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
@@ skipping 23 matching lines @@
                 point = FloatPoint(point.x() - toRenderBox(container)->x().toFloat(), point.y() - toRenderBox(container)->y().toFloat());
             m_paintOffset = LayoutSize(point.x(), point.y());
 
             applyClipIfNeeded(*container);
         }
     } else {
         applyClipIfNeeded(m_renderer);
     }
 }
 
-PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, RenderSVGModelObject& renderer, const RenderLayerModelObject& paintInvalidationContainer)
-    : m_clipped(next.m_clipped)
-    , m_cachedOffsetsEnabled(next.m_cachedOffsetsEnabled)
-    , m_forceCheckForPaintInvalidation(next.m_forceCheckForPaintInvalidation)
-    , m_paintInvalidationContainer(paintInvalidationContainer)
-    , m_renderer(renderer)
-{
-    // FIXME: SVG could probably benefit from a stack-based optimization like html does. crbug.com/391054
-    ASSERT(!m_cachedOffsetsEnabled);
-}
-
-PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, RenderInline& renderer, const RenderLayerModelObject& paintInvalidationContainer)
+PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, RenderLayerModelObject& renderer, const RenderLayerModelObject& paintInvalidationContainer)
     : m_clipped(false)
     , m_cachedOffsetsEnabled(true)
     , m_forceCheckForPaintInvalidation(next.m_forceCheckForPaintInvalidation)
     , m_paintInvalidationContainer(paintInvalidationContainer)
     , m_renderer(renderer)
 {
-    bool establishesPaintInvalidationContainer = &m_renderer == &m_paintInvalidationContainer;
-    if (establishesPaintInvalidationContainer) {
-        // When we hit a new paint invalidation container, we don't need to
-        // continue forcing a check for paint invalidation because movement
-        // from our parents will just move the whole invalidation container.
-        m_forceCheckForPaintInvalidation = false;
-    } else {
-        if (!renderer.supportsPaintInvalidationStateCachedOffsets() || !next.m_cachedOffsetsEnabled) {
-            m_cachedOffsetsEnabled = false;
-        } else if (m_cachedOffsetsEnabled) {
-            m_paintOffset = next.m_paintOffset;
-            // Handle relative positioned inline.
-            if (renderer.style()->hasInFlowPosition() && renderer.layer())
-                m_paintOffset += renderer.layer()->offsetForInFlowPosition();
-
-            // RenderInline can't be out-of-flow positioned.
-        }
-
-        // The following can't apply to RenderInline so we just propagate them.
-        m_clipped = next.m_clipped;
-        m_clipRect = next.m_clipRect;
-    }
-}
-
-PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, RenderBox& renderer, const RenderLayerModelObject& paintInvalidationContainer)
-    : m_clipped(false)
-    , m_cachedOffsetsEnabled(true)
-    , m_forceCheckForPaintInvalidation(next.m_forceCheckForPaintInvalidation)
-    , m_paintInvalidationContainer(paintInvalidationContainer)
-    , m_renderer(renderer)
-{
+    // FIXME: SVG could probably benefit from a stack-based optimization like html does. crbug.com/391054
     bool establishesPaintInvalidationContainer = &m_renderer == &m_paintInvalidationContainer;
     bool fixed = m_renderer.isOutOfFlowPositioned() && m_renderer.style()->position() == FixedPosition;
 
     if (establishesPaintInvalidationContainer) {
         // When we hit a new paint invalidation container, we don't need to
         // continue forcing a check for paint invalidation because movement
         // from our parents will just move the whole invalidation container.
         m_forceCheckForPaintInvalidation = false;
     } else {
         if (!renderer.supportsPaintInvalidationStateCachedOffsets() || !next.m_cachedOffsetsEnabled) {
             m_cachedOffsetsEnabled = false;
         } else {
-            LayoutSize offset = m_renderer.isTableRow() ? LayoutSize() : renderer.locationOffset();
+            LayoutSize offset = m_renderer.isBox() && !m_renderer.isTableRow() ? toRenderBox(renderer).locationOffset() : LayoutSize();
             if (fixed) {
                 // FIXME: This doesn't work correctly with transforms.
                 FloatPoint fixedOffset = m_renderer.view()->localToAbsolute(FloatPoint(), IsFixed);
                 m_paintOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset;
             } else {
                 m_paintOffset = next.m_paintOffset + offset;
             }
 
             if (m_renderer.isOutOfFlowPositioned() && !fixed) {
                 if (RenderObject* container = m_renderer.container()) {
                     if (container->style()->hasInFlowPosition() && container->isRenderInline())
-                        m_paintOffset += toRenderInline(container)->offsetForInFlowPositionedInline(renderer);
+                        m_paintOffset += toRenderInline(container)->offsetForInFlowPositionedInline(toRenderBox(renderer));
                 }
             }
 
             if (m_renderer.style()->hasInFlowPosition() && renderer.hasLayer())
                 m_paintOffset += renderer.layer()->offsetForInFlowPosition();
         }
 
         m_clipped = !fixed && next.m_clipped;
         if (m_clipped)
             m_clipRect = next.m_clipRect;
@@ skipping 14 matching lines @@
     if (m_clipped) {
         m_clipRect.intersect(clipRect);
     } else {
         m_clipRect = clipRect;
         m_clipped = true;
     }
     m_paintOffset -= box.scrolledContentOffset();
 }
 
 } // namespace blink