Revert of Skip paint property update and visual rect update if no geometry change

third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutBlockItem.h"
 #include "core/layout/api/LayoutItem.h"
 #include "core/layout/api/LayoutViewItem.h"
-#include "core/paint/FindPaintOffsetAndVisualRectNeedingUpdate.h"
 #include "core/paint/ObjectPaintInvalidator.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintInvalidator.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 
 namespace blink {
 
 CaretDisplayItemClient::CaretDisplayItemClient() = default;
@@ skipping 167 matching lines @@
   context.paintingLayer->setNeedsRepaint();
   objectInvalidator.invalidateDisplayItemClient(*this, PaintInvalidationCaret);
   m_previousLayoutBlock = nullptr;
 }
 
 void CaretDisplayItemClient::invalidatePaintInCurrentLayoutBlock(
     const PaintInvalidatorContext& context) {
   DCHECK(m_layoutBlock);
 
   LayoutRect newVisualRect;
-#if DCHECK_IS_ON()
-  FindVisualRectNeedingUpdateScope finder(*m_layoutBlock, context, m_visualRect,
-                                          newVisualRect);
-#endif
-  if (context.needsVisualRectUpdate(*m_layoutBlock)) {
-    if (!m_localRect.isEmpty()) {
-      newVisualRect = m_localRect;
-      context.mapLocalRectToVisualRectInBacking(*m_layoutBlock, newVisualRect);
+  if (!m_localRect.isEmpty()) {
+    newVisualRect = m_localRect;
+    context.mapLocalRectToVisualRectInBacking(*m_layoutBlock, newVisualRect);
 
-      if (m_layoutBlock->usesCompositedScrolling()) {
-        // The caret should use scrolling coordinate space.
-        DCHECK(m_layoutBlock == context.paintInvalidationContainer);
-        newVisualRect.move(LayoutSize(m_layoutBlock->scrolledContentOffset()));
-      }
+    if (m_layoutBlock->usesCompositedScrolling()) {
+      // The caret should use scrolling coordinate space.
+      DCHECK(m_layoutBlock == context.paintInvalidationContainer);
+      newVisualRect.move(LayoutSize(m_layoutBlock->scrolledContentOffset()));
     }
-  } else {
-    newVisualRect = m_visualRect;
   }
 
   if (m_layoutBlock == m_previousLayoutBlock)
     m_previousLayoutBlock = nullptr;
 
   ObjectPaintInvalidatorWithContext objectInvalidator(*m_layoutBlock, context);
   if (!m_needsPaintInvalidation && newVisualRect == m_visualRect) {
     // The caret may change paint offset without changing visual rect, and we
     // need to invalidate the display item client if the block is doing full
     // paint invalidation.
@@ skipping 43 matching lines @@
 
 String CaretDisplayItemClient::debugName() const {
   return "Caret";
 }
 
 LayoutRect CaretDisplayItemClient::visualRect() const {
   return m_visualRect;
 }
 
 }  // namespace blink