Invalidate caret during paint invalidation

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 22 matching lines @@
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/ElementVisibilityObserver.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/IntersectionObserverCallback.h"
 #include "core/dom/IntersectionObserverController.h"
 #include "core/dom/IntersectionObserverInit.h"
 #include "core/dom/ResizeObserverController.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/TaskRunnerHelper.h"
+#include "core/editing/DragCaret.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/events/ErrorEvent.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Location.h"
@@ skipping 33 matching lines @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/RootScrollerUtil.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
+#include "core/paint/BlockPaintInvalidator.h"
 #include "core/paint/FramePainter.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintTiming.h"
 #include "core/paint/PrePaintTreeWalk.h"
 #include "core/plugins/PluginView.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/Histogram.h"
 #include "platform/HostWindow.h"
@@ skipping 1227 matching lines @@
 #endif
 
   lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
 }
 
 void FrameView::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   RELEASE_ASSERT(!layoutViewItem().isNull());
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);
-
-  m_frame->selection().invalidateCaretRect();
 }
 
 void FrameView::setNeedsPaintPropertyUpdate() {
   m_needsPaintPropertyUpdate = true;
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     if (auto* layoutView = this->layoutView()) {
       layoutView->setNeedsPaintPropertyUpdate();
       return;
     }
   }
@@ skipping 1679 matching lines @@
     m_paintController = PaintController::create();
 
   if (!m_geometryMapper)
     m_geometryMapper.reset(new GeometryMapper());
   // TODO(chrishtr): the cache only needs to be invalidated if one or more of
   // the property tree nodes changed.
   m_geometryMapper->clearCache();
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::InPrePaint);
+    frameView.m_frame->selection().updateForPaintInvalidation();
+    frameView.m_frame->page()->dragCaret().updateForPaintInvalidation();

[chrishtr, 2017/02/07 05:29:12]

How about conceptually adding this at the end of layout instead?
Then the code would be named and put in that place also.

[Xianzhu, 2017/02/07 20:00:14]

Done, with the functions renamed to updateStyleAndLayoutIfNeeded().

     if (frameView.canThrottleRendering()) {
       // This frame can be throttled but not throttled, meaning we are not in an
       // AllowThrottlingScope. Now this frame may contain dirty paint flags, and
       // we need to propagate the flags into the ancestor chain so that
       // PrePaintTreeWalk can reach this frame.
       frameView.setNeedsPaintPropertyUpdate();
     }
   });
 
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
@@ skipping 194 matching lines @@
   if (frame().document()->hasFinishedParsing() &&
       frame().loader().stateMachine()->committedFirstRealDocumentLoad())
     m_isVisuallyNonEmpty = true;
 }
 
 void FrameView::invalidateTreeIfNeededRecursive() {
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PaintInvalidation.UpdateTime");
   {
     // For comparison to SlimmingPaintInvalidation.
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PrePaint.UpdateTime");
+    forAllNonThrottledFrameViews([](FrameView& frameView) {
+      frameView.m_frame->selection().updateForPaintInvalidation();
+      frameView.m_frame->page()->dragCaret().updateForPaintInvalidation();
+    });
     invalidateTreeIfNeededRecursiveInternal();
   }
 }
 
 void FrameView::invalidateTreeIfNeededRecursiveInternal() {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
   CHECK(layoutView());
 
   // We need to stop recursing here since a child frame view might not be
   // throttled even though we are (e.g., it didn't compute its visibility yet).
   if (shouldThrottleRendering())
     return;
-  TRACE_EVENT1("blink", "FrameView::invalidateTreeIfNeededRecursive", "root",
-               layoutView()->debugName().ascii());
+  TRACE_EVENT0("blink", "FrameView::invalidateTreeIfNeededRecursiveInternal");
 
   Vector<const LayoutObject*> pendingDelayedPaintInvalidations;
   PaintInvalidationState rootPaintInvalidationState(
       *layoutView(), pendingDelayedPaintInvalidations);
 
   if (lifecycle().state() < DocumentLifecycle::PaintInvalidationClean)
     invalidateTreeIfNeeded(rootPaintInvalidationState);
 
   // Some frames may be not reached during the above invalidateTreeIfNeeded
   // because
   // - the frame is a detached frame; or
   // - it didn't need paint invalidation.
-  // We need to call invalidateTreeIfNeededRecursive() for such frames to finish
-  // required paint invalidation and advance their life cycle state.
+  // We need to call invalidateTreeIfNeededRecursiveInternal() for such frames
+  // to finish required paint invalidation and advance their life cycle state.
   for (Frame* child = m_frame->tree().firstChild(); child;
        child = child->tree().nextSibling()) {
     if (child->isLocalFrame()) {
       FrameView& childFrameView = *toLocalFrame(child)->view();
       // The children frames can be in any state, including stopping.
       // Thus we have to check that it makes sense to do paint
       // invalidation onto them here.
       if (!childFrameView.layoutView())
         continue;
       childFrameView.invalidateTreeIfNeededRecursiveInternal();
@@ skipping 1799 matching lines @@
     std::unique_ptr<CompositorAnimationTimeline> timeline) {
   m_animationTimeline = std::move(timeline);
 }
 
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 }  // namespace blink