Inline LayoutBlock::invalidateCaret and remove redundant needs-repaint on layer.

third_party/WebKit/Source/core/layout/LayoutBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 208 matching lines @@
         textAutosizer->record(this);
 
     propagateStyleToAnonymousChildren();
 
     // It's possible for our border/padding to change, but for the overall logical width or height of the block to
     // end up being the same. We keep track of this change so in layoutBlock, we can know to set relayoutChildren=true.
     m_widthAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalDimensionChanged(*oldStyle, newStyle, LogicalWidth);
     m_heightAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalDimensionChanged(*oldStyle, newStyle, LogicalHeight);
 }
 
-void LayoutBlock::invalidateCaret() const
-{
-    if (hasCaret()) {
-        ObjectPaintInvalidator(*this).slowSetPaintingLayerNeedsRepaint();
-        frame()->selection().setCaretRectNeedsUpdate();
-        frame()->selection().invalidateCaretRect(true);
-    }
-}
-
 void LayoutBlock::updateFromStyle()
 {
     LayoutBox::updateFromStyle();
 
     bool shouldClipOverflow = !styleRef().isOverflowVisible() && allowsOverflowClip();
     if (shouldClipOverflow != hasOverflowClip()) {
         if (!shouldClipOverflow)
             getScrollableArea()->invalidateAllStickyConstraints();
         setMayNeedPaintInvalidationSubtree();
     }
@@ skipping 682 matching lines @@
     positionedDescendants->remove(o);
     if (positionedDescendants->isEmpty()) {
         gPositionedDescendantsMap->remove(container);
         container->m_hasPositionedObjects = false;
     }
 }
 
 PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
     PaintInvalidationReason reason = LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
-    if (reason != PaintInvalidationNone)
-        invalidateCaret();
+    if (reason != PaintInvalidationNone && hasCaret()) {
+        ObjectPaintInvalidator(*this).slowSetPaintingLayerNeedsRepaint();

[chrishtr, 2016/09/02 21:26:53]

On reflection I don't think we need line 932. If paint invalidation is not None
then needsRepaint
will be set by other means.

[wkorman, 2016/09/02 23:17:36]

Done.

+        frame()->selection().setCaretRectNeedsUpdate();
+        frame()->selection().invalidateCaretRect(true);
+    }
     return reason;
 }
 
 void LayoutBlock::removePositionedObjects(LayoutBlock* o, ContainingBlockState containingBlockState)
 {
     TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
     if (!positionedDescendants)
         return;
 
     Vector<LayoutBox*, 16> deadObjects;
@@ skipping 996 matching lines @@
 
     return availableHeight;
 }
 
 bool LayoutBlock::hasDefiniteLogicalHeight() const
 {
     return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
 }
 
 } // namespace blink