Add mask layer and offsetFromLayoutObject info to GraphicsLayer JSON

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 630 matching lines @@
   std::unique_ptr<JSONObject> json = JSONObject::create();
 
   if (flags & LayerTreeIncludesDebugInfo)
     json->setString("this", pointerAsString(this));
 
   json->setString("name", debugName());
 
   if (m_position != FloatPoint())
     json->setArray("position", pointAsJSONArray(m_position));
 
+  if (m_offsetFromLayoutObject != DoubleSize()) {
+    json->setArray("offsetFromLayoutObject",
+                   sizeAsJSONArray(m_offsetFromLayoutObject));
+  }

[Stephen Chennney, 2016/12/07 20:29:11]

I'm not so sure about outputting this. Lots of layers have non-zero and it
changes lots of test text output. Your thoughts?

[ajuma, 2016/12/07 22:53:18]

What about adding a LayerTreeFlag for it and only outputting when the flag is
set? Then tests that care about this can opt into it.

+
   if (m_hasTransformOrigin &&
       m_transformOrigin !=
           FloatPoint3D(m_size.width() * 0.5f, m_size.height() * 0.5f, 0))
     json->setArray("transformOrigin", pointAsJSONArray(m_transformOrigin));
 
   if (m_size != IntSize())
     json->setArray("bounds", sizeAsJSONArray(m_size));
 
   if (m_opacity != 1)
     json->setDouble("opacity", m_opacity);
@@ skipping 100 matching lines @@
       if (m_debugInfo.getSquashingDisallowedReasons() &
           kSquashingDisallowedReasonStringMap[i].reason) {
         squashingDisallowedReasonsJSON->pushString(
             debug ? kSquashingDisallowedReasonStringMap[i].description
                   : kSquashingDisallowedReasonStringMap[i].shortName);
       }
     }
     json->setArray("squashingDisallowedReasons",
                    std::move(squashingDisallowedReasonsJSON));
   }
+
+  if (m_maskLayer) {
+    std::unique_ptr<JSONArray> maskLayerJSON = JSONArray::create();
+    maskLayerJSON->pushObject(
+        m_maskLayer->layerAsJSONInternal(flags, renderingContextMap));
+    json->setArray("maskLayer", std::move(maskLayerJSON));
+  }
+
+  if (m_contentsClippingMaskLayer) {
+    std::unique_ptr<JSONArray> contentsClippingMaskLayerJSON =
+        JSONArray::create();
+    contentsClippingMaskLayerJSON->pushObject(
+        m_contentsClippingMaskLayer->layerAsJSONInternal(flags,
+                                                         renderingContextMap));
+    json->setArray("contentsClippingMaskLayer",
+                   std::move(contentsClippingMaskLayerJSON));
+  }

[Stephen Chennney, 2016/12/07 20:29:11]

These missing layers were a big issue in originally trying to figure out how
mask layers worked.

+
   return json;
 }
 
 std::unique_ptr<JSONObject> GraphicsLayer::layerTreeAsJSONInternal(
     LayerTreeFlags flags,
     RenderingContextMap& renderingContextMap) const {
   std::unique_ptr<JSONObject> json =
       layerAsJSONInternal(flags, renderingContextMap);
 
   if (m_children.size()) {
@@ skipping 538 matching lines @@
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) {
   if (!layer) {
     LOG(INFO) << "Cannot showGraphicsLayerTree for (nil).";
     return;
   }
 
   String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
   LOG(INFO) << output.utf8().data();
 }
 #endif