Chromium -> Mojo roll.

cc/resources/tile.cc

Index: cc/resources/tile.cc
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index f86330e4b5bdf2b8e947d5b8e9d31909642d25ba..45b4a30816e1958d2065eaffaa4e306d4a75486a 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -48,7 +48,8 @@ Tile::~Tile() {
       "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");
@@ -58,6 +59,8 @@ void Tile::AsValueInto(base::trace_event::TracedValue* res) const {
 
   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();
@@ -66,6 +69,10 @@ void Tile::AsValueInto(base::trace_event::TracedValue* res) const {
   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();