Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: IsEmpty + rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "cc/layers/heads_up_display_layer.h" 9 #include "cc/layers/heads_up_display_layer.h"
10 #include "cc/layers/layer_impl.h" 10 #include "cc/layers/layer_impl.h"
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 child_resource_provider_ = FakeResourceProvider::Create( 873 child_resource_provider_ = FakeResourceProvider::Create(
874 child_context_provider_.get(), shared_bitmap_manager_.get()); 874 child_context_provider_.get(), shared_bitmap_manager_.get());
875 } 875 }
876 876
877 static void EmptyReleaseCallback(const gpu::SyncToken& sync_token, 877 static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
878 bool lost) {} 878 bool lost) {}
879 879
880 void SetupTree() override { 880 void SetupTree() override {
881 gpu::gles2::GLES2Interface* gl = child_context_provider_->ContextGL(); 881 gpu::gles2::GLES2Interface* gl = child_context_provider_->ContextGL();
882 882
883 std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
884
885 std::unique_ptr<RenderPass> pass_for_quad = RenderPass::Create(); 883 std::unique_ptr<RenderPass> pass_for_quad = RenderPass::Create();
886 pass_for_quad->SetNew( 884 pass_for_quad->SetNew(
887 // AppendOneOfEveryQuadType() makes a RenderPass quad with this id. 885 // AppendOneOfEveryQuadType() makes a RenderPass quad with this id.
888 RenderPassId(2, 1), gfx::Rect(0, 0, 10, 10), gfx::Rect(0, 0, 10, 10), 886 RenderPassId(2, 1), gfx::Rect(0, 0, 10, 10), gfx::Rect(0, 0, 10, 10),
889 gfx::Transform()); 887 gfx::Transform());
890 888
891 std::unique_ptr<RenderPass> pass = RenderPass::Create(); 889 std::unique_ptr<RenderPass> pass = RenderPass::Create();
892 pass->SetNew(RenderPassId(1, 1), gfx::Rect(0, 0, 10, 10), 890 pass->SetNew(RenderPassId(1, 1), gfx::Rect(0, 0, 10, 10),
893 gfx::Rect(0, 0, 10, 10), gfx::Transform()); 891 gfx::Rect(0, 0, 10, 10), gfx::Transform());
894 gpu::SyncToken mailbox_sync_token; 892 gpu::SyncToken mailbox_sync_token;
895 AddOneOfEveryQuadType(pass.get(), child_resource_provider_.get(), 893 AddOneOfEveryQuadType(pass.get(), child_resource_provider_.get(),
896 RenderPassId(2, 1), &mailbox_sync_token); 894 RenderPassId(2, 1), &mailbox_sync_token);
897 895
898 frame_data->render_pass_list.push_back(std::move(pass_for_quad));
danakj 2016/10/27 23:06:57 these exist for DelegatedRendererLayer which doesn
Saman Sami 2016/10/28 16:47:36 Done.
899 frame_data->render_pass_list.push_back(std::move(pass));
900
901 ResourceId resource = child_resource_provider_->CreateResource( 896 ResourceId resource = child_resource_provider_->CreateResource(
902 gfx::Size(4, 4), ResourceProvider::TEXTURE_HINT_IMMUTABLE, RGBA_8888, 897 gfx::Size(4, 4), ResourceProvider::TEXTURE_HINT_IMMUTABLE, RGBA_8888,
903 gfx::ColorSpace()); 898 gfx::ColorSpace());
904 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(), 899 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(),
905 resource, false); 900 resource, false);
906 901
907 gpu::Mailbox mailbox; 902 gpu::Mailbox mailbox;
908 gl->GenMailboxCHROMIUM(mailbox.name); 903 gl->GenMailboxCHROMIUM(mailbox.name);
909 904
910 const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); 905 const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 1648
1654 FakeContentLayerClient client_; 1649 FakeContentLayerClient client_;
1655 int num_draws_ = 0; 1650 int num_draws_ = 0;
1656 }; 1651 };
1657 1652
1658 MULTI_THREAD_TEST_F( 1653 MULTI_THREAD_TEST_F(
1659 LayerTreeHostContextTestLoseWorkerContextDuringPrepareTiles); 1654 LayerTreeHostContextTestLoseWorkerContextDuringPrepareTiles);
1660 1655
1661 } // namespace 1656 } // namespace
1662 } // namespace cc 1657 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698