| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 root_pass->shared_quad_state_list.push_back(shared_quad_state.Pass()); | 128 root_pass->shared_quad_state_list.push_back(shared_quad_state.Pass()); |
| 129 | 129 |
| 130 frame->render_pass_list.push_back(root_pass.Pass()); | 130 frame->render_pass_list.push_back(root_pass.Pass()); |
| 131 return frame.Pass(); | 131 return frame.Pass(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void AddTransferableResource(DelegatedFrameData* frame, | 134 void AddTransferableResource(DelegatedFrameData* frame, |
| 135 ResourceProvider::ResourceId resource_id) { | 135 ResourceProvider::ResourceId resource_id) { |
| 136 TransferableResource resource; | 136 TransferableResource resource; |
| 137 resource.id = resource_id; | 137 resource.id = resource_id; |
| 138 resource.target = GL_TEXTURE_2D; | 138 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; |
| 139 frame->resource_list.push_back(resource); | 139 frame->resource_list.push_back(resource); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void AddTextureQuad(DelegatedFrameData* frame, | 142 void AddTextureQuad(DelegatedFrameData* frame, |
| 143 ResourceProvider::ResourceId resource_id) { | 143 ResourceProvider::ResourceId resource_id) { |
| 144 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create(); | 144 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create(); |
| 145 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); | 145 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
| 146 float vertex_opacity[4] = { 1.f, 1.f, 1.f, 1.f }; | 146 float vertex_opacity[4] = { 1.f, 1.f, 1.f, 1.f }; |
| 147 quad->SetNew(sqs.get(), | 147 quad->SetNew(sqs.get(), |
| 148 gfx::Rect(0, 0, 10, 10), | 148 gfx::Rect(0, 0, 10, 10), |
| (...skipping 2209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2358 } | 2358 } |
| 2359 | 2359 |
| 2360 scoped_refptr<DelegatedRendererLayer> delegated_thief_; | 2360 scoped_refptr<DelegatedRendererLayer> delegated_thief_; |
| 2361 }; | 2361 }; |
| 2362 | 2362 |
| 2363 SINGLE_AND_MULTI_THREAD_TEST_F( | 2363 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 2364 LayerTreeHostDelegatedTestRemoveAndChangeResources); | 2364 LayerTreeHostDelegatedTestRemoveAndChangeResources); |
| 2365 | 2365 |
| 2366 } // namespace | 2366 } // namespace |
| 2367 } // namespace cc | 2367 } // namespace cc |
| OLD | NEW |