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

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

Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_blending.cc ('k') | cc/trees/layer_tree_settings.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 child_output_surface_ = FakeOutputSurface::Create3d(); 905 child_output_surface_ = FakeOutputSurface::Create3d();
906 child_output_surface_->BindToClient(&output_surface_client_); 906 child_output_surface_->BindToClient(&output_surface_client_);
907 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 907 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
908 child_resource_provider_ = 908 child_resource_provider_ =
909 ResourceProvider::Create(child_output_surface_.get(), 909 ResourceProvider::Create(child_output_surface_.get(),
910 shared_bitmap_manager_.get(), 910 shared_bitmap_manager_.get(),
911 NULL, 911 NULL,
912 NULL, 912 NULL,
913 0, 913 0,
914 false, 914 false,
915 1, 915 1);
916 false);
917 } 916 }
918 917
919 static void EmptyReleaseCallback(unsigned sync_point, bool lost) {} 918 static void EmptyReleaseCallback(unsigned sync_point, bool lost) {}
920 919
921 void SetupTree() override { 920 void SetupTree() override {
922 gpu::gles2::GLES2Interface* gl = 921 gpu::gles2::GLES2Interface* gl =
923 child_output_surface_->context_provider()->ContextGL(); 922 child_output_surface_->context_provider()->ContextGL();
924 923
925 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); 924 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
926 925
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 void AfterTest() override {} 1706 void AfterTest() override {}
1708 1707
1709 bool deferred_; 1708 bool deferred_;
1710 }; 1709 };
1711 1710
1712 SINGLE_AND_MULTI_THREAD_TEST_F( 1711 SINGLE_AND_MULTI_THREAD_TEST_F(
1713 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); 1712 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
1714 1713
1715 } // namespace 1714 } // namespace
1716 } // namespace cc 1715 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_blending.cc ('k') | cc/trees/layer_tree_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698