Chromium -> Mojo roll.

cc/resources/tile.cc

 // Copyright 2012 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 "cc/resources/tile.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
@@ skipping 30 matching lines @@
   for (int i = 0; i <= LAST_TREE; i++)
     is_occluded_[i] = false;
 }
 
 Tile::~Tile() {
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"),
       "cc::Tile", this);
 }
 
-void Tile::AsValueInto(base::trace_event::TracedValue* res) const {
+void Tile::AsValueWithPriorityInto(const TilePriority& priority,
+                                   base::trace_event::TracedValue* res) const {
   TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"), res, "cc::Tile", this);
   TracedValue::SetIDRef(raster_source_.get(), res, "picture_pile");
   res->SetDouble("contents_scale", contents_scale_);
 
   MathUtil::AddToTracedValue("content_rect", content_rect_, res);
 
   res->SetInteger("layer_id", layer_id_);
 
+  // TODO(vmpstr): Remove active and pending priority once tracing is using
+  // combined priority or at least can support both.
   res->BeginDictionary("active_priority");
   priority_[ACTIVE_TREE].AsValueInto(res);
   res->EndDictionary();
 
   res->BeginDictionary("pending_priority");
   priority_[PENDING_TREE].AsValueInto(res);
   res->EndDictionary();
 
+  res->BeginDictionary("combined_priority");
+  priority.AsValueInto(res);
+  res->EndDictionary();
+
   res->BeginDictionary("draw_info");
   draw_info_.AsValueInto(res);
   res->EndDictionary();
 
   res->SetBoolean("has_resource", HasResource());
   res->SetBoolean("is_using_gpu_memory", HasResource() || HasRasterTask());
   res->SetString("resolution",
                  TileResolutionToString(combined_priority().resolution));
 
   res->SetInteger("scheduled_priority", scheduled_priority_);
 
   res->SetBoolean("use_picture_analysis", use_picture_analysis());
 
   res->SetInteger("gpu_memory_usage", GPUMemoryUsageInBytes());
 }
 
 size_t Tile::GPUMemoryUsageInBytes() const {
   if (draw_info_.resource_)
     return draw_info_.resource_->bytes();
   return 0;
 }
 
 }  // namespace cc