Fix caret paint invalidation issue on partial lifecycle updates

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1347 matching lines @@
 #if DCHECK_IS_ON()
   layoutView()->assertSubtreeClearedPaintInvalidationFlags();
 #endif
 
   lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
 }
 
 void FrameView::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   RELEASE_ASSERT(!layoutViewItem().isNull());
+  updateCaretsForPaintInvalidation();
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);
 }
 
 void FrameView::setNeedsPaintPropertyUpdate() {
   m_needsPaintPropertyUpdate = true;
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     if (auto* layoutView = this->layoutView()) {
       layoutView->setNeedsPaintPropertyUpdate();
       return;
@@ skipping 1960 matching lines @@
   updateWidgetGeometriesIfNeeded();
 
   if (lifecycle().state() < DocumentLifecycle::LayoutClean)
     lifecycle().advanceTo(DocumentLifecycle::LayoutClean);
 
   // Ensure that we become visually non-empty eventually.
   // TODO(esprehn): This should check isRenderingReady() instead.
   if (frame().document()->hasFinishedParsing() &&
       frame().loader().stateMachine()->committedFirstRealDocumentLoad())
     m_isVisuallyNonEmpty = true;
-
-  frame().selection().updateStyleAndLayoutIfNeeded();
-  frame().page()->dragCaret().updateStyleAndLayoutIfNeeded();
 }
 
 void FrameView::invalidateTreeIfNeededRecursive() {
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PaintInvalidation.UpdateTime");
   {
     // For comparison to SlimmingPaintInvalidation.
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PrePaint.UpdateTime");
     invalidateTreeIfNeededRecursiveInternal();
   }
 }
@@ skipping 1888 matching lines @@
 
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
+void FrameView::updateCaretsForPaintInvalidation() {
+  m_frame->selection().updateForPaintInvalidation();
+  if (m_frame->isMainFrame())

[chrishtr, 2017/03/08 01:41:56]

This conditional appears to be new. Is that correct? If so, why?

+    m_frame->page()->dragCaret().updateForPaintInvalidation();
+}
+
 }  // namespace blink