Add FrameView::updateAllLifecyclePhasesExceptPaint and use it in a few cases.

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintControllerPaintTest_h
 #define PaintControllerPaintTest_h
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
@@ skipping 23 matching lines @@
         GraphicsLayer::setDrawDebugRedFillForTesting(false);
         RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_enableSlimmingPaintV2);
     }
     void TearDown() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintInvalidationEnabled(m_originalSlimmingPaintInvalidationEnabled);
         RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
         GraphicsLayer::setDrawDebugRedFillForTesting(true);
     }
 
-    // Expose some document lifecycle steps for checking new display items before commiting.
-    void updateLifecyclePhasesBeforePaint()
-    {
-        // This doesn't do all steps that FrameView does, but is enough for current tests.
-        FrameView* frameView = document().view();
-        frameView->updateLifecyclePhasesInternal(FrameView::OnlyUpToCompositingCleanPlusScrolling);
-        frameView->invalidateTreeIfNeededRecursive();
-        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-            document().view()->updatePaintProperties();
-    }
-
-    void updateLifecyclePhasesToPaintClean()
-    {
-        updateLifecyclePhasesBeforePaint();
-        document().view()->synchronizedPaint();
-    }
-
     bool paintWithoutCommit(const IntRect* interestRect = nullptr)
     {
         // Only root graphics layer is supported.
         document().view()->lifecycle().advanceTo(DocumentLifecycle::InPaint);
         if (!layoutView().layer()->graphicsLayerBacking()->paintWithoutCommit(interestRect)) {
             document().view()->lifecycle().advanceTo(DocumentLifecycle::PaintClean);
             return false;
         }
         return true;
     }
@@ skipping 77 matching lines @@
 const DisplayItem::Type backgroundType = DisplayItem::BoxDecorationBackground;
 const DisplayItem::Type cachedBackgroundType = DisplayItem::drawingTypeToCachedDrawingType(backgroundType);
 const DisplayItem::Type foregroundType = DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground);
 const DisplayItem::Type cachedForegroundType = DisplayItem::drawingTypeToCachedDrawingType(foregroundType);
 const DisplayItem::Type documentBackgroundType = DisplayItem::DocumentBackground;
 const DisplayItem::Type cachedDocumentBackgroundType = DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::DocumentBackground);
 
 } // namespace blink
 
 #endif // PaintControllerPaintTest_h