Fix bad cast in PaintInvalidationState::updateForNormalChildren()

third_party/WebKit/Source/core/layout/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 "core/layout/PaintInvalidationState.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 273 matching lines @@
             m_cachedOffsetsForAbsolutePositionEnabled = false;
         }
     }
 }
 
 void PaintInvalidationState::updateForNormalChildren()
 {
     if (!m_cachedOffsetsEnabled)
         return;
 
-    if (!m_currentObject.isBoxModelObject() && !m_currentObject.isSVG())
+    if (!m_currentObject.isBox())
         return;
+    const LayoutBox& box = toLayoutBox(m_currentObject);
 
-    if (m_currentObject.isLayoutView()) {
-        if (!m_currentObject.document().settings() || !m_currentObject.document().settings()->rootLayerScrolls()) {
-            if (m_currentObject != m_paintInvalidationContainer) {
-                m_paintOffset -= toLayoutView(m_currentObject).frameView()->scrollOffset();
-                addClipRectRelativeToPaintOffset(toLayoutView(m_currentObject).viewRect());
+    if (box.isLayoutView()) {
+        if (!box.document().settings() || !box.document().settings()->rootLayerScrolls()) {
+            if (box != m_paintInvalidationContainer) {
+                m_paintOffset -= toLayoutView(box).frameView()->scrollOffset();
+                addClipRectRelativeToPaintOffset(toLayoutView(box).viewRect());
             }
             return;
         }
-    } else if (m_currentObject.isSVGRoot()) {
-        const LayoutSVGRoot& svgRoot = toLayoutSVGRoot(m_currentObject);
+    } else if (box.isSVGRoot()) {
+        const LayoutSVGRoot& svgRoot = toLayoutSVGRoot(box);
         if (svgRoot.shouldApplyViewportClip())
             addClipRectRelativeToPaintOffset(LayoutRect(LayoutPoint(), LayoutSize(svgRoot.pixelSnappedSize())));
-    } else if (m_currentObject.isTableRow()) {
+    } else if (box.isTableRow()) {
         // Child table cell's locationOffset() includes its row's locationOffset().
-        m_paintOffset -= toLayoutBox(m_currentObject).locationOffset();
+        m_paintOffset -= box.locationOffset();
     }
 
-    if (!m_currentObject.hasClipRelatedProperty())
+    if (!box.hasClipRelatedProperty())
         return;
 
-    const LayoutBox& box = toLayoutBox(m_currentObject);
-
     // Do not clip or scroll for the paint invalidation container, if it scrolls overflow, because it will always use composited
     // scrolling in this case.
     if (box == m_paintInvalidationContainer && box.scrollsOverflow()) {
         DCHECK(!m_clipped); // The box establishes paint invalidation container, so no m_clipped inherited.
     } else {
         // This won't work fully correctly for fixed-position elements, who should receive CSS clip but for whom the current object
         // is not in the containing block chain.
         addClipRectRelativeToPaintOffset(box.clippingRect());
         if (box.hasOverflowClip())
             m_paintOffset -= box.scrolledContentOffset();
@@ skipping 211 matching lines @@
 }
 
 
 void PaintInvalidatorContextAdapter::mapLocalRectToPaintInvalidationBacking(const LayoutObject& object, LayoutRect& rect) const
 {
     DCHECK(&object == &m_paintInvalidationState.currentObject());
     m_paintInvalidationState.mapLocalRectToPaintInvalidationBacking(rect);
 }
 
 } // namespace blink