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

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

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix gn for nacl Created 5 years, 10 months 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 "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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 986
987 frame_data->render_pass_list.push_back(pass_for_quad.Pass()); 987 frame_data->render_pass_list.push_back(pass_for_quad.Pass());
988 frame_data->render_pass_list.push_back(pass.Pass()); 988 frame_data->render_pass_list.push_back(pass.Pass());
989 989
990 delegated_resource_collection_ = new DelegatedFrameResourceCollection; 990 delegated_resource_collection_ = new DelegatedFrameResourceCollection;
991 delegated_frame_provider_ = new DelegatedFrameProvider( 991 delegated_frame_provider_ = new DelegatedFrameProvider(
992 delegated_resource_collection_.get(), frame_data.Pass()); 992 delegated_resource_collection_.get(), frame_data.Pass());
993 993
994 ResourceProvider::ResourceId resource = 994 ResourceProvider::ResourceId resource =
995 child_resource_provider_->CreateResource( 995 child_resource_provider_->CreateResource(
996 gfx::Size(4, 4), 996 gfx::Size(4, 4), GL_CLAMP_TO_EDGE,
997 GL_CLAMP_TO_EDGE, 997 ResourceProvider::TEXTURE_HINT_IMMUTABLE, RGBA_8888);
998 ResourceProvider::TextureHintImmutable,
999 RGBA_8888);
1000 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(), 998 ResourceProvider::ScopedWriteLockGL lock(child_resource_provider_.get(),
1001 resource); 999 resource);
1002 1000
1003 gpu::Mailbox mailbox; 1001 gpu::Mailbox mailbox;
1004 gl->GenMailboxCHROMIUM(mailbox.name); 1002 gl->GenMailboxCHROMIUM(mailbox.name);
1005 GLuint sync_point = gl->InsertSyncPointCHROMIUM(); 1003 GLuint sync_point = gl->InsertSyncPointCHROMIUM();
1006 1004
1007 scoped_refptr<Layer> root = Layer::Create(); 1005 scoped_refptr<Layer> root = Layer::Create();
1008 root->SetBounds(gfx::Size(10, 10)); 1006 root->SetBounds(gfx::Size(10, 10));
1009 root->SetIsDrawable(true); 1007 root->SetIsDrawable(true);
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
1736 void AfterTest() override {} 1734 void AfterTest() override {}
1737 1735
1738 bool deferred_; 1736 bool deferred_;
1739 }; 1737 };
1740 1738
1741 SINGLE_AND_MULTI_THREAD_TEST_F( 1739 SINGLE_AND_MULTI_THREAD_TEST_F(
1742 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); 1740 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
1743 1741
1744 } // namespace 1742 } // namespace
1745 } // namespace cc 1743 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | cc/trees/layer_tree_host_unittest_no_message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698