| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 60c71beaba7c6e58bd00f3e0dc8319f93b49a844..56f2a17b8d717e1cd08eadbdb009f2b75f58a0f6 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -3085,7 +3085,7 @@ class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
|
| scoped_refptr<TestContextProvider> context_provider =
|
| TestContextProvider::Create(); // Not bound to thread.
|
| EXPECT_TRUE(
|
| - fake_output_surface->InitializeAndSetContext3d(context_provider, NULL));
|
| + fake_output_surface->InitializeAndSetContext3d(context_provider));
|
| did_initialize_gl_ = true;
|
| }
|
|
|
| @@ -4608,31 +4608,6 @@ class LayerTreeHostTestMemoryLimits : public LayerTreeHostTest {
|
|
|
| SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(LayerTreeHostTestMemoryLimits);
|
|
|
| -class LayerSetsNeedsFilterContext : public Layer {
|
| - public:
|
| - static scoped_refptr<LayerSetsNeedsFilterContext> Create() {
|
| - return make_scoped_refptr(new LayerSetsNeedsFilterContext());
|
| - }
|
| -
|
| - virtual bool Update(ResourceUpdateQueue* queue,
|
| - const OcclusionTracker<Layer>* occlusion) OVERRIDE {
|
| - bool updated = Layer::Update(queue, occlusion);
|
| - if (needs_context_) {
|
| - layer_tree_host()->set_needs_filter_context();
|
| - return true;
|
| - }
|
| - return updated;
|
| - }
|
| -
|
| - void set_needs_context(bool need) { needs_context_ = need; }
|
| -
|
| - private:
|
| - LayerSetsNeedsFilterContext() : needs_context_(false) {}
|
| - virtual ~LayerSetsNeedsFilterContext() {}
|
| -
|
| - bool needs_context_;
|
| -};
|
| -
|
| class LayerTreeHostTestNoQuadsForEmptyLayer : public LayerTreeHostTest {
|
| protected:
|
| virtual void SetupTree() OVERRIDE {
|
|
|