Snapshot of all changes to get jumbo in blink and content.

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

Index: third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.cpp b/third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.cpp
index d6b9b47af4c3d232998c57eb58c63968a42b063a..7625e0e23a92dd96c64fd7624a91355bccf668c8 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.cpp
@@ -14,7 +14,7 @@
 namespace blink {
 
 template <typename T>
-static std::unique_ptr<JSONArray> PointAsJSONArray(const T& point) {
+static std::unique_ptr<JSONArray> PointAsJSONArray2(const T& point) {
   std::unique_ptr<JSONArray> array = JSONArray::Create();
   array->PushDouble(point.X());
   array->PushDouble(point.Y());
@@ -22,7 +22,7 @@ static std::unique_ptr<JSONArray> PointAsJSONArray(const T& point) {
 }
 
 template <typename T>
-static std::unique_ptr<JSONArray> SizeAsJSONArray(const T& size) {
+static std::unique_ptr<JSONArray> SizeAsJSONArray2(const T& size) {
   std::unique_ptr<JSONArray> array = JSONArray::Create();
   array->PushDouble(size.Width());
   array->PushDouble(size.Height());
@@ -58,12 +58,12 @@ std::unique_ptr<JSONObject> ContentLayerClientImpl::LayerAsJSON(
   FloatPoint position(cc_picture_layer_->offset_to_transform_parent().x(),
                       cc_picture_layer_->offset_to_transform_parent().y());
   if (position != FloatPoint())
-    json->SetArray("position", PointAsJSONArray(position));
+    json->SetArray("position", PointAsJSONArray2(position));
 
   IntSize bounds(cc_picture_layer_->bounds().width(),
                  cc_picture_layer_->bounds().height());
   if (!bounds.IsEmpty())
-    json->SetArray("bounds", SizeAsJSONArray(bounds));
+    json->SetArray("bounds", SizeAsJSONArray2(bounds));
 
   json->SetBoolean("contentsOpaque", cc_picture_layer_->contents_opaque());
   json->SetBoolean("drawsContent", cc_picture_layer_->DrawsContent());