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 28 matching lines...) Expand all Loading... |
39 TransferableResource resource; | 39 TransferableResource resource; |
40 resource.id = resource_id; | 40 resource.id = resource_id; |
41 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; | 41 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; |
42 frame->resource_list.push_back(resource); | 42 frame->resource_list.push_back(resource); |
43 } | 43 } |
44 | 44 |
45 void AddTextureQuad(DelegatedFrameData* frame, | 45 void AddTextureQuad(DelegatedFrameData* frame, |
46 ResourceProvider::ResourceId resource_id) { | 46 ResourceProvider::ResourceId resource_id) { |
47 SharedQuadState* sqs = | 47 SharedQuadState* sqs = |
48 frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); | 48 frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); |
49 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); | 49 TextureDrawQuad* quad = |
| 50 frame->render_pass_list[0]->CreateAndAppendDrawQuad<TextureDrawQuad>(); |
50 float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f}; | 51 float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f}; |
51 quad->SetNew(sqs, | 52 quad->SetNew(sqs, |
52 gfx::Rect(0, 0, 10, 10), | 53 gfx::Rect(0, 0, 10, 10), |
53 gfx::Rect(0, 0, 10, 10), | 54 gfx::Rect(0, 0, 10, 10), |
54 gfx::Rect(0, 0, 10, 10), | 55 gfx::Rect(0, 0, 10, 10), |
55 resource_id, | 56 resource_id, |
56 false, | 57 false, |
57 gfx::PointF(0.f, 0.f), | 58 gfx::PointF(0.f, 0.f), |
58 gfx::PointF(1.f, 1.f), | 59 gfx::PointF(1.f, 1.f), |
59 SK_ColorTRANSPARENT, | 60 SK_ColorTRANSPARENT, |
60 vertex_opacity, | 61 vertex_opacity, |
61 false); | 62 false); |
62 frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>()); | |
63 } | 63 } |
64 | 64 |
65 virtual void SetUp() OVERRIDE { | 65 virtual void SetUp() OVERRIDE { |
66 resource_collection_ = new DelegatedFrameResourceCollection; | 66 resource_collection_ = new DelegatedFrameResourceCollection; |
67 resource_collection_->SetClient(this); | 67 resource_collection_->SetClient(this); |
68 } | 68 } |
69 | 69 |
70 virtual void TearDown() OVERRIDE { resource_collection_->SetClient(NULL); } | 70 virtual void TearDown() OVERRIDE { resource_collection_->SetClient(NULL); } |
71 | 71 |
72 virtual void UnusedResourcesAreAvailable() OVERRIDE { | 72 virtual void UnusedResourcesAreAvailable() OVERRIDE { |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 | 388 |
389 frame_provider_ = NULL; | 389 frame_provider_ = NULL; |
390 | 390 |
391 // Nothing is returned twice. | 391 // Nothing is returned twice. |
392 EXPECT_FALSE(ReturnAndResetResourcesAvailable()); | 392 EXPECT_FALSE(ReturnAndResetResourcesAvailable()); |
393 EXPECT_EQ(0u, resources_.size()); | 393 EXPECT_EQ(0u, resources_.size()); |
394 } | 394 } |
395 | 395 |
396 } // namespace | 396 } // namespace |
397 } // namespace cc | 397 } // namespace cc |
OLD | NEW |