sdf

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

 // 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.
 
 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/compositing_display_item.h"
@@ skipping 515 matching lines @@
   contentLayerClient->clearPaintChunkDebugData();
 
   for (const auto& paintChunk : pendingLayer.paintChunks) {
     RasterInvalidationTracking* rasterTracking =
         trackingMap ? trackingMap->find(paintChunk) : nullptr;
     DCHECK(!rasterTracking ||
            rasterTracking->trackedRasterInvalidations.size() ==
                paintChunk->rasterInvalidationRects.size());
 
     if (storeDebugInfo) {
-      contentLayerClient->addPaintChunkDebugData(
-          paintArtifact.getDisplayItemList().subsequenceAsJSON(
+      std::unique_ptr<JSONArray> jsonArrayForChunk = paintArtifact.getDisplayItemList().subsequenceAsJSON(
               paintChunk->beginIndex, paintChunk->endIndex,
               DisplayItemList::SkipNonDrawings |
-                  DisplayItemList::ShownOnlyDisplayItemTypes));
+                  DisplayItemList::ShownOnlyDisplayItemTypes);
+
+      std::unique_ptr<JSONObject> jsonForTransform = JSONObject::create();
+      jsonForTransform->setString("transform", paintChunk->properties.propertyTreeState.transform()->toString());
+      jsonArrayForChunk->pushObject(std::move(jsonForTransform));
+      std::unique_ptr<JSONObject> jsonForScroll = JSONObject::create();
+      jsonForScroll->setString("scroll", paintChunk->properties.propertyTreeState.scroll()->toString());
+      jsonArrayForChunk->pushObject(std::move(jsonForScroll));
+      std::unique_ptr<JSONObject> jsonForClip = JSONObject::create();
+      jsonForClip->setString("clip", paintChunk->properties.propertyTreeState.clip()->toString());
+      jsonArrayForChunk->pushObject(std::move(jsonForClip));
+      contentLayerClient->addPaintChunkDebugData(std::move(jsonArrayForChunk));
     }
 
     for (unsigned index = 0; index < paintChunk->rasterInvalidationRects.size();
          ++index) {
       IntRect rect(
           enclosingIntRect(paintChunk->rasterInvalidationRects[index]));
       gfx::Rect ccInvalidationRect(rect.x(), rect.y(),
                                    std::max(0, rect.width()),
                                    std::max(0, rect.height()));
       if (ccInvalidationRect.IsEmpty())
@@ skipping 27 matching lines @@
 
   if (newChunk.properties.backfaceHidden !=
       pendingLayerFirstChunk.properties.backfaceHidden)
     return false;
 
   DCHECK_GE(candidatePendingLayer.paintChunks.size(), 1u);
   PropertyTreeStateIterator iterator(newChunk.properties.propertyTreeState);
   for (const PropertyTreeState* currentState =
            &newChunk.properties.propertyTreeState;
        currentState; currentState = iterator.next()) {
-    if (*currentState == candidatePendingLayer.propertyTreeState)
+    if (currentState->equivalentGeometry(candidatePendingLayer.propertyTreeState)) {
       return true;
+    }
+//    if (*currentState == candidatePendingLayer.propertyTreeState) {
+//      return true;
+//    }
     if (currentState->hasDirectCompositingReasons())
       return false;
   }
   return false;
 }
 
 bool PaintArtifactCompositor::mightOverlap(
     const PaintChunk& paintChunk,
     const PendingLayer& candidatePendingLayer,
     GeometryMapper& geometryMapper) {
@@ skipping 137 matching lines @@
       m_extraDataForTesting->contentLayers.push_back(layer);
   }
   m_contentLayerClients.clear();
   m_contentLayerClients.swap(newContentLayerClients);
 
   // Mark the property trees as having been rebuilt.
   layerTree->property_trees()->sequence_number =
       PropertyTreeManager::kPropertyTreeSequenceNumber;
   layerTree->property_trees()->needs_rebuild = false;
   layerTree->property_trees()->ResetCachedData();
+
+  showDebugData();
 }
 
 #ifndef NDEBUG
 void PaintArtifactCompositor::showDebugData() {
   LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
                     ->toPrettyJSONString()
                     .utf8()
                     .data();
 }
 #endif
 
 }  // namespace blink