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

third_party/WebKit/Source/platform/graphics/compositing/ContentLayerClientImpl.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/ContentLayerClientImpl.h"
 
 #include "platform/graphics/compositing/PaintChunksToCcLayer.h"
 #include "platform/graphics/paint/GeometryMapper.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/graphics/paint/PaintChunk.h"
 #include "platform/graphics/paint/RasterInvalidationTracking.h"
 #include "platform/json/JSONValues.h"
 
 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());
   return array;
 }
 
 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());
   return array;
 }
 
 void ContentLayerClientImpl::SetTracksRasterInvalidations(bool should_track) {
   if (should_track) {
     raster_invalidation_tracking_info_ =
         WTF::MakeUnique<RasterInvalidationTrackingInfo>();
@@ skipping 15 matching lines @@
 }
 
 std::unique_ptr<JSONObject> ContentLayerClientImpl::LayerAsJSON(
     LayerTreeFlags flags) {
   std::unique_ptr<JSONObject> json = JSONObject::Create();
   json->SetString("name", debug_name_);
 
   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());
 
   if (flags & kLayerTreeIncludesDebugInfo) {
     std::unique_ptr<JSONArray> paint_chunk_contents_array = JSONArray::Create();
     for (const auto& debug_data : paint_chunk_debug_data_) {
       paint_chunk_contents_array->PushValue(debug_data->Clone());
     }
     json->SetArray("paintChunkContents", std::move(paint_chunk_contents_array));
@@ skipping 239 matching lines @@
   if (raster_invalidation_tracking_info_) {
     raster_invalidation_tracking_info_->old_client_debug_names.clear();
     std::swap(raster_invalidation_tracking_info_->old_client_debug_names,
               raster_invalidation_tracking_info_->new_client_debug_names);
   }
 
   return cc_picture_layer_;
 }
 
 }  // namespace blink