SPv2: Add support for tracking raster paint invalidations in testing.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 785 matching lines @@
 }
 
 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) {
   spellChecker().removeSpellingMarkersUnderWords(words);
 }
 
 String LocalFrame::layerTreeAsText(unsigned flags) const {
   if (contentLayoutItem().isNull())
     return String();
 
-  std::unique_ptr<JSONObject> layerTree =
-      contentLayoutItem().compositor()->layerTreeAsJSON(
-          static_cast<LayerTreeFlags>(flags));
+  std::unique_ptr<JSONObject> layers;
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    layers = view()->compositedLayersAsJSON(static_cast<LayerTreeFlags>(flags));
+  } else {
+    layers = contentLayoutItem().compositor()->layerTreeAsJSON(
+        static_cast<LayerTreeFlags>(flags));
+  }
 
   if (flags & LayerTreeIncludesPaintInvalidations) {
     std::unique_ptr<JSONArray> objectPaintInvalidations =
         m_view->trackedObjectPaintInvalidationsAsJSON();
     if (objectPaintInvalidations && objectPaintInvalidations->size()) {
-      if (!layerTree)
-        layerTree = JSONObject::create();
-      layerTree->setArray("objectPaintInvalidations",
-                          std::move(objectPaintInvalidations));
+      if (!layers)
+        layers = JSONObject::create();
+      layers->setArray("objectPaintInvalidations",
+                       std::move(objectPaintInvalidations));
     }
   }
 
-  return layerTree ? layerTree->toPrettyJSONString() : String();
+  return layers ? layers->toPrettyJSONString() : String();
 }
 
 bool LocalFrame::shouldThrottleRendering() const {
   return view() && view()->shouldThrottleRendering();
 }
 
 inline LocalFrame::LocalFrame(FrameLoaderClient* client,
                               FrameHost* host,
                               FrameOwner* owner,
                               InterfaceProvider* interfaceProvider)
@@ skipping 56 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink