| Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| index 64c9798093cc4d4f29486ab75d447b43cad23b99..1fa949d239748c74fc2ce766dba2e923d4dafb75 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| @@ -226,15 +226,6 @@ void LayoutBlock::styleDidChange(StyleDifference diff, const ComputedStyle* oldS
|
| 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();
|
| @@ -937,8 +928,10 @@ void LayoutBlock::removePositionedObject(LayoutBox* o)
|
| PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
|
| {
|
| PaintInvalidationReason reason = LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
|
| - if (reason != PaintInvalidationNone)
|
| - invalidateCaret();
|
| + if (reason != PaintInvalidationNone && hasCaret()) {
|
| + frame()->selection().setCaretRectNeedsUpdate();
|
| + frame()->selection().invalidateCaretRect(true);
|
| + }
|
| return reason;
|
| }
|
|
|
|
|