Add mask layer and offsetFromLayoutObject info to GraphicsLayer JSON

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

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
index 32f307ae6586b4231d9813c7b843200a1323ca33..55b20d38141879bd740a87dce407fd13bb8bbb8b 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -648,6 +648,12 @@ std::unique_ptr<JSONObject> GraphicsLayer::layerAsJSONInternal(
   if (m_position != FloatPoint())
     json->setArray("position", pointAsJSONArray(m_position));
 
+  if (flags & LayerTreeIncludesDebugInfo &&
+      m_offsetFromLayoutObject != DoubleSize()) {
+    json->setArray("offsetFromLayoutObject",
+                   sizeAsJSONArray(m_offsetFromLayoutObject));
+  }
+
   if (m_hasTransformOrigin &&
       m_transformOrigin !=
           FloatPoint3D(m_size.width() * 0.5f, m_size.height() * 0.5f, 0))
@@ -768,6 +774,24 @@ std::unique_ptr<JSONObject> GraphicsLayer::layerAsJSONInternal(
     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));
+  }
+
   return json;
 }