| 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/layers/delegated_frame_provider.h" | 5 #include "cc/layers/delegated_frame_provider.h" |
| 6 #include "cc/layers/delegated_frame_resource_collection.h" | 6 #include "cc/layers/delegated_frame_resource_collection.h" |
| 7 #include "cc/layers/delegated_renderer_layer.h" | 7 #include "cc/layers/delegated_renderer_layer.h" |
| 8 #include "cc/output/delegated_frame_data.h" | 8 #include "cc/output/delegated_frame_data.h" |
| 9 #include "cc/quads/texture_draw_quad.h" | 9 #include "cc/quads/texture_draw_quad.h" |
| 10 #include "cc/resources/returned_resource.h" | 10 #include "cc/resources/returned_resource.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 root_damage_rect, | 30 root_damage_rect, |
| 31 gfx::Transform()); | 31 gfx::Transform()); |
| 32 frame->render_pass_list.push_back(root_pass.Pass()); | 32 frame->render_pass_list.push_back(root_pass.Pass()); |
| 33 return frame.Pass(); | 33 return frame.Pass(); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void AddTransferableResource(DelegatedFrameData* frame, | 36 void AddTransferableResource(DelegatedFrameData* frame, |
| 37 ResourceProvider::ResourceId resource_id) { | 37 ResourceProvider::ResourceId resource_id) { |
| 38 TransferableResource resource; | 38 TransferableResource resource; |
| 39 resource.id = resource_id; | 39 resource.id = resource_id; |
| 40 resource.target = GL_TEXTURE_2D; | 40 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; |
| 41 frame->resource_list.push_back(resource); | 41 frame->resource_list.push_back(resource); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void AddTextureQuad(DelegatedFrameData* frame, | 44 void AddTextureQuad(DelegatedFrameData* frame, |
| 45 ResourceProvider::ResourceId resource_id) { | 45 ResourceProvider::ResourceId resource_id) { |
| 46 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create(); | 46 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create(); |
| 47 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); | 47 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
| 48 float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f}; | 48 float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f}; |
| 49 quad->SetNew(sqs.get(), | 49 quad->SetNew(sqs.get(), |
| 50 gfx::Rect(0, 0, 10, 10), | 50 gfx::Rect(0, 0, 10, 10), |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 | 386 |
| 387 frame_provider_ = NULL; | 387 frame_provider_ = NULL; |
| 388 | 388 |
| 389 // Nothing is returned twice. | 389 // Nothing is returned twice. |
| 390 EXPECT_FALSE(ReturnAndResetResourcesAvailable()); | 390 EXPECT_FALSE(ReturnAndResetResourcesAvailable()); |
| 391 EXPECT_EQ(0u, resources_.size()); | 391 EXPECT_EQ(0u, resources_.size()); |
| 392 } | 392 } |
| 393 | 393 |
| 394 } // namespace | 394 } // namespace |
| 395 } // namespace cc | 395 } // namespace cc |
| OLD | NEW |