Move "prePaint" under the "Update Layer Tree" devtools timeline step

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 2920 matching lines @@
         if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
           invalidateTreeIfNeededRecursive();
 
         if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
           if (view.compositor()->inCompositingMode())
             scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
         }
 
         updateCompositedSelectionIfNeeded();
       }
+
+      // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
+      // for slimming paint v2.
+      if (targetState >= DocumentLifecycle::PrePaintClean)
+        prePaint();
     }
 
-    if (targetState >= DocumentLifecycle::PrePaintClean)
-      prePaint();
-
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
       DocumentAnimations::updateAnimations(layoutView()->document());
 
     if (targetState == DocumentLifecycle::PaintClean) {
       if (!m_frame->document()->printing())
         paintTree();
 
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         pushPaintArtifactToCompositor();
 
@@ skipping 1946 matching lines @@
        reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
        ++reason) {
     if (m_mainThreadScrollingReasonsCounter[reason] > 0) {
       reasons |= 1 << reason;
     }
   }
   return reasons;
 }
 
 }  // namespace blink