Update from chromium https://crrev.com/302282

cc/surfaces/surface_aggregator.cc

Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index ae0fce01a6fd7470afb973b9210ffdb41727ccbf..44afaffd66991b66264a19267a55e2549163ba31 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -4,6 +4,8 @@
 
 #include "cc/surfaces/surface_aggregator.h"
 
+#include <map>
+
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
@@ -139,9 +141,9 @@ bool SurfaceAggregator::TakeResources(Surface* surface,
                  &invalid_frame,
                  provider_->GetChildToParentMap(child_id),
                  &referenced_resources);
-  for (auto* render_pass : *render_pass_list) {
-    for (auto& quad : render_pass->quad_list)
-      quad.IterateResources(remap);
+  for (const auto& render_pass : *render_pass_list) {
+    for (const auto& quad : render_pass->quad_list)
+      quad->IterateResources(remap);
   }
 
   if (!invalid_frame)
@@ -305,25 +307,24 @@ void SurfaceAggregator::CopyQuadsToPass(
   SharedQuadStateList::ConstIterator sqs_iter =
       source_shared_quad_state_list.begin();
   for (const auto& quad : source_quad_list) {
-    while (quad.shared_quad_state != &*sqs_iter) {
+    while (quad->shared_quad_state != *sqs_iter) {
       ++sqs_iter;
       DCHECK(sqs_iter != source_shared_quad_state_list.end());
     }
-    DCHECK_EQ(quad.shared_quad_state, &*sqs_iter);
+    DCHECK_EQ(quad->shared_quad_state, *sqs_iter);
 
-    if (quad.material == DrawQuad::SURFACE_CONTENT) {
-      const SurfaceDrawQuad* surface_quad =
-          SurfaceDrawQuad::MaterialCast(&quad);
+    if (quad->material == DrawQuad::SURFACE_CONTENT) {
+      const SurfaceDrawQuad* surface_quad = SurfaceDrawQuad::MaterialCast(quad);
       HandleSurfaceQuad(surface_quad, dest_pass);
     } else {
-      if (quad.shared_quad_state != last_copied_source_shared_quad_state) {
+      if (quad->shared_quad_state != last_copied_source_shared_quad_state) {
         CopySharedQuadState(
-            quad.shared_quad_state, content_to_target_transform, dest_pass);
-        last_copied_source_shared_quad_state = quad.shared_quad_state;
+            quad->shared_quad_state, content_to_target_transform, dest_pass);
+        last_copied_source_shared_quad_state = quad->shared_quad_state;
       }
-      if (quad.material == DrawQuad::RENDER_PASS) {
+      if (quad->material == DrawQuad::RENDER_PASS) {
         const RenderPassDrawQuad* pass_quad =
-            RenderPassDrawQuad::MaterialCast(&quad);
+            RenderPassDrawQuad::MaterialCast(quad);
         RenderPassId original_pass_id = pass_quad->render_pass_id;
         RenderPassId remapped_pass_id =
             RemapPassId(original_pass_id, surface_id);
@@ -334,7 +335,7 @@ void SurfaceAggregator::CopyQuadsToPass(
             remapped_pass_id);
       } else {
         dest_pass->CopyFromAndAppendDrawQuad(
-            &quad, dest_pass->shared_quad_state_list.back());
+            quad, dest_pass->shared_quad_state_list.back());
       }
     }
   }