| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/surfaces/surface_aggregator.h" | 5 #include "cc/surfaces/surface_aggregator.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 SharedQuadState* shared_quad_state = | 231 SharedQuadState* shared_quad_state = |
| 232 dest_pass->CreateAndAppendSharedQuadState(); | 232 dest_pass->CreateAndAppendSharedQuadState(); |
| 233 shared_quad_state->CopyFrom(surface_quad->shared_quad_state); | 233 shared_quad_state->CopyFrom(surface_quad->shared_quad_state); |
| 234 RenderPassDrawQuad* quad = | 234 RenderPassDrawQuad* quad = |
| 235 dest_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); | 235 dest_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
| 236 quad->SetNew(shared_quad_state, | 236 quad->SetNew(shared_quad_state, |
| 237 surface_quad->rect, | 237 surface_quad->rect, |
| 238 surface_quad->visible_rect, | 238 surface_quad->visible_rect, |
| 239 remapped_pass_id, | 239 remapped_pass_id, |
| 240 0, | 240 0, |
| 241 gfx::RectF(), | 241 gfx::Vector2dF(), |
| 242 gfx::Size(), |
| 242 FilterOperations(), | 243 FilterOperations(), |
| 243 gfx::Vector2dF(), | 244 gfx::Vector2dF(), |
| 244 FilterOperations()); | 245 FilterOperations()); |
| 245 } | 246 } |
| 246 dest_pass->damage_rect = | 247 dest_pass->damage_rect = |
| 247 gfx::UnionRects(dest_pass->damage_rect, | 248 gfx::UnionRects(dest_pass->damage_rect, |
| 248 MathUtil::MapEnclosingClippedRect( | 249 MathUtil::MapEnclosingClippedRect( |
| 249 surface_quad->quadTransform(), | 250 surface_quad->quadTransform(), |
| 250 DamageRectForSurface(surface, last_pass))); | 251 DamageRectForSurface(surface, last_pass))); |
| 251 | 252 |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 surface->TakeLatencyInfo(&frame->metadata.latency_info); | 392 surface->TakeLatencyInfo(&frame->metadata.latency_info); |
| 392 } | 393 } |
| 393 | 394 |
| 394 // TODO(jamesr): Aggregate all resource references into the returned frame's | 395 // TODO(jamesr): Aggregate all resource references into the returned frame's |
| 395 // resource list. | 396 // resource list. |
| 396 | 397 |
| 397 return frame.Pass(); | 398 return frame.Pass(); |
| 398 } | 399 } |
| 399 | 400 |
| 400 } // namespace cc | 401 } // namespace cc |
| OLD | NEW |