| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 RenderPass* render_pass = frame->render_pass_list[0]; | 184 RenderPass* render_pass = frame->render_pass_list[0]; |
| 185 SharedQuadState* sqs = render_pass->CreateAndAppendSharedQuadState(); | 185 SharedQuadState* sqs = render_pass->CreateAndAppendSharedQuadState(); |
| 186 RenderPassDrawQuad* quad = | 186 RenderPassDrawQuad* quad = |
| 187 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); | 187 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
| 188 | 188 |
| 189 quad->SetNew(sqs, | 189 quad->SetNew(sqs, |
| 190 output_rect, | 190 output_rect, |
| 191 output_rect, | 191 output_rect, |
| 192 id, | 192 id, |
| 193 0, // mask_resource_id | 193 0, |
| 194 gfx::Rect(0, 0, 1, 1), // mask_uv_rect | 194 gfx::Vector2dF(), |
| 195 gfx::Size(), |
| 195 filters, | 196 filters, |
| 196 gfx::Vector2dF(), | 197 gfx::Vector2dF(), |
| 197 background_filters); | 198 background_filters); |
| 198 } | 199 } |
| 199 | 200 |
| 200 static ResourceProvider::ResourceId AppendResourceId( | 201 static ResourceProvider::ResourceId AppendResourceId( |
| 201 std::vector<ResourceProvider::ResourceId>* resources_in_last_sent_frame, | 202 std::vector<ResourceProvider::ResourceId>* resources_in_last_sent_frame, |
| 202 ResourceProvider::ResourceId resource_id) { | 203 ResourceProvider::ResourceId resource_id) { |
| 203 resources_in_last_sent_frame->push_back(resource_id); | 204 resources_in_last_sent_frame->push_back(resource_id); |
| 204 return resource_id; | 205 return resource_id; |
| (...skipping 1987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2192 } | 2193 } |
| 2193 | 2194 |
| 2194 scoped_refptr<DelegatedRendererLayer> delegated_thief_; | 2195 scoped_refptr<DelegatedRendererLayer> delegated_thief_; |
| 2195 }; | 2196 }; |
| 2196 | 2197 |
| 2197 SINGLE_AND_MULTI_THREAD_TEST_F( | 2198 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 2198 LayerTreeHostDelegatedTestRemoveAndChangeResources); | 2199 LayerTreeHostDelegatedTestRemoveAndChangeResources); |
| 2199 | 2200 |
| 2200 } // namespace | 2201 } // namespace |
| 2201 } // namespace cc | 2202 } // namespace cc |
| OLD | NEW |