| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "cc/layers/content_layer.h" | 8 #include "cc/layers/content_layer.h" |
| 9 #include "cc/layers/delegated_frame_provider.h" | 9 #include "cc/layers/delegated_frame_provider.h" |
| 10 #include "cc/layers/delegated_frame_resource_collection.h" | 10 #include "cc/layers/delegated_frame_resource_collection.h" |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 frame_data->render_pass_list.push_back(pass.PassAs<RenderPass>()); | 717 frame_data->render_pass_list.push_back(pass.PassAs<RenderPass>()); |
| 718 | 718 |
| 719 delegated_resource_collection_ = new DelegatedFrameResourceCollection; | 719 delegated_resource_collection_ = new DelegatedFrameResourceCollection; |
| 720 delegated_frame_provider_ = new DelegatedFrameProvider( | 720 delegated_frame_provider_ = new DelegatedFrameProvider( |
| 721 delegated_resource_collection_.get(), frame_data.Pass()); | 721 delegated_resource_collection_.get(), frame_data.Pass()); |
| 722 | 722 |
| 723 ResourceProvider::ResourceId resource = | 723 ResourceProvider::ResourceId resource = |
| 724 child_resource_provider_->CreateResource( | 724 child_resource_provider_->CreateResource( |
| 725 gfx::Size(4, 4), | 725 gfx::Size(4, 4), |
| 726 GL_CLAMP_TO_EDGE, | 726 GL_CLAMP_TO_EDGE, |
| 727 ResourceProvider::TextureUsageAny, | 727 ResourceProvider::TextureHintImmutable, |
| 728 RGBA_8888); | 728 RGBA_8888); |
| 729 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(), | 729 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(), |
| 730 resource); | 730 resource); |
| 731 | 731 |
| 732 gpu::Mailbox mailbox; | 732 gpu::Mailbox mailbox; |
| 733 gl->GenMailboxCHROMIUM(mailbox.name); | 733 gl->GenMailboxCHROMIUM(mailbox.name); |
| 734 GLuint sync_point = gl->InsertSyncPointCHROMIUM(); | 734 GLuint sync_point = gl->InsertSyncPointCHROMIUM(); |
| 735 | 735 |
| 736 scoped_refptr<Layer> root = Layer::Create(); | 736 scoped_refptr<Layer> root = Layer::Create(); |
| 737 root->SetBounds(gfx::Size(10, 10)); | 737 root->SetBounds(gfx::Size(10, 10)); |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 virtual void AfterTest() OVERRIDE {} | 1535 virtual void AfterTest() OVERRIDE {} |
| 1536 | 1536 |
| 1537 bool deferred_; | 1537 bool deferred_; |
| 1538 }; | 1538 }; |
| 1539 | 1539 |
| 1540 // TODO(danakj): We don't use scheduler with SingleThreadProxy yet. | 1540 // TODO(danakj): We don't use scheduler with SingleThreadProxy yet. |
| 1541 MULTI_THREAD_TEST_F(LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); | 1541 MULTI_THREAD_TEST_F(LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); |
| 1542 | 1542 |
| 1543 } // namespace | 1543 } // namespace |
| 1544 } // namespace cc | 1544 } // namespace cc |
| OLD | NEW |