| 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/base/thread_impl.h" | 8 #include "cc/base/thread_impl.h" | 
| 9 #include "cc/layers/content_layer.h" | 9 #include "cc/layers/content_layer.h" | 
| 10 #include "cc/layers/heads_up_display_layer.h" | 10 #include "cc/layers/heads_up_display_layer.h" | 
| 11 #include "cc/layers/io_surface_layer.h" | 11 #include "cc/layers/io_surface_layer.h" | 
| 12 #include "cc/layers/layer_impl.h" | 12 #include "cc/layers/layer_impl.h" | 
| 13 #include "cc/layers/picture_layer.h" | 13 #include "cc/layers/picture_layer.h" | 
| 14 #include "cc/layers/scrollbar_layer.h" | 14 #include "cc/layers/scrollbar_layer.h" | 
| 15 #include "cc/layers/texture_layer.h" | 15 #include "cc/layers/texture_layer.h" | 
| 16 #include "cc/layers/texture_layer_impl.h" | 16 #include "cc/layers/texture_layer_impl.h" | 
| 17 #include "cc/layers/video_layer.h" | 17 #include "cc/layers/video_layer.h" | 
| 18 #include "cc/layers/video_layer_impl.h" | 18 #include "cc/layers/video_layer_impl.h" | 
|  | 19 #include "cc/output/filter_operations.h" | 
| 19 #include "cc/test/fake_content_layer.h" | 20 #include "cc/test/fake_content_layer.h" | 
| 20 #include "cc/test/fake_content_layer_client.h" | 21 #include "cc/test/fake_content_layer_client.h" | 
| 21 #include "cc/test/fake_content_layer_impl.h" | 22 #include "cc/test/fake_content_layer_impl.h" | 
| 22 #include "cc/test/fake_context_provider.h" | 23 #include "cc/test/fake_context_provider.h" | 
| 23 #include "cc/test/fake_delegated_renderer_layer.h" | 24 #include "cc/test/fake_delegated_renderer_layer.h" | 
| 24 #include "cc/test/fake_delegated_renderer_layer_impl.h" | 25 #include "cc/test/fake_delegated_renderer_layer_impl.h" | 
| 25 #include "cc/test/fake_layer_tree_host_client.h" | 26 #include "cc/test/fake_layer_tree_host_client.h" | 
| 26 #include "cc/test/fake_output_surface.h" | 27 #include "cc/test/fake_output_surface.h" | 
| 27 #include "cc/test/fake_scrollbar.h" | 28 #include "cc/test/fake_scrollbar.h" | 
| 28 #include "cc/test/fake_scrollbar_layer.h" | 29 #include "cc/test/fake_scrollbar_layer.h" | 
| 29 #include "cc/test/fake_video_frame_provider.h" | 30 #include "cc/test/fake_video_frame_provider.h" | 
| 30 #include "cc/test/layer_tree_test.h" | 31 #include "cc/test/layer_tree_test.h" | 
| 31 #include "cc/test/render_pass_test_common.h" | 32 #include "cc/test/render_pass_test_common.h" | 
| 32 #include "cc/test/test_web_graphics_context_3d.h" | 33 #include "cc/test/test_web_graphics_context_3d.h" | 
| 33 #include "cc/trees/layer_tree_host_impl.h" | 34 #include "cc/trees/layer_tree_host_impl.h" | 
| 34 #include "cc/trees/layer_tree_impl.h" | 35 #include "cc/trees/layer_tree_impl.h" | 
| 35 #include "cc/trees/single_thread_proxy.h" | 36 #include "cc/trees/single_thread_proxy.h" | 
| 36 #include "gpu/GLES2/gl2extchromium.h" | 37 #include "gpu/GLES2/gl2extchromium.h" | 
| 37 #include "media/base/media.h" | 38 #include "media/base/media.h" | 
| 38 #include "third_party/WebKit/public/platform/WebFilterOperations.h" |  | 
| 39 | 39 | 
| 40 using media::VideoFrame; | 40 using media::VideoFrame; | 
| 41 using WebKit::WebGraphicsContext3D; | 41 using WebKit::WebGraphicsContext3D; | 
| 42 | 42 | 
| 43 namespace cc { | 43 namespace cc { | 
| 44 namespace { | 44 namespace { | 
| 45 | 45 | 
| 46 // These tests deal with losing the 3d graphics context. | 46 // These tests deal with losing the 3d graphics context. | 
| 47 class LayerTreeHostContextTest : public LayerTreeTest { | 47 class LayerTreeHostContextTest : public LayerTreeTest { | 
| 48  public: | 48  public: | 
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 413     root_->SetAnchorPoint(gfx::PointF()); | 413     root_->SetAnchorPoint(gfx::PointF()); | 
| 414     root_->SetIsDrawable(true); | 414     root_->SetIsDrawable(true); | 
| 415 | 415 | 
| 416     content_ = FakeContentLayer::Create(&client_); | 416     content_ = FakeContentLayer::Create(&client_); | 
| 417     content_->SetBounds(gfx::Size(10, 10)); | 417     content_->SetBounds(gfx::Size(10, 10)); | 
| 418     content_->SetAnchorPoint(gfx::PointF()); | 418     content_->SetAnchorPoint(gfx::PointF()); | 
| 419     content_->SetIsDrawable(true); | 419     content_->SetIsDrawable(true); | 
| 420     if (use_surface_) { | 420     if (use_surface_) { | 
| 421       content_->SetForceRenderSurface(true); | 421       content_->SetForceRenderSurface(true); | 
| 422       // Filters require us to create an offscreen context. | 422       // Filters require us to create an offscreen context. | 
| 423       WebKit::WebFilterOperations filters; | 423       FilterOperations filters; | 
| 424       filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(0.5f)); | 424       filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f)); | 
| 425       content_->SetFilters(filters); | 425       content_->SetFilters(filters); | 
| 426       content_->SetBackgroundFilters(filters); | 426       content_->SetBackgroundFilters(filters); | 
| 427     } | 427     } | 
| 428 | 428 | 
| 429     root_->AddChild(content_); | 429     root_->AddChild(content_); | 
| 430 | 430 | 
| 431     layer_tree_host()->SetRootLayer(root_); | 431     layer_tree_host()->SetRootLayer(root_); | 
| 432     LayerTreeHostContextTest::SetupTree(); | 432     LayerTreeHostContextTest::SetupTree(); | 
| 433   } | 433   } | 
| 434 | 434 | 
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 544     root_->SetBounds(gfx::Size(10, 10)); | 544     root_->SetBounds(gfx::Size(10, 10)); | 
| 545     root_->SetAnchorPoint(gfx::PointF()); | 545     root_->SetAnchorPoint(gfx::PointF()); | 
| 546     root_->SetIsDrawable(true); | 546     root_->SetIsDrawable(true); | 
| 547 | 547 | 
| 548     content_ = FakeContentLayer::Create(&client_); | 548     content_ = FakeContentLayer::Create(&client_); | 
| 549     content_->SetBounds(gfx::Size(10, 10)); | 549     content_->SetBounds(gfx::Size(10, 10)); | 
| 550     content_->SetAnchorPoint(gfx::PointF()); | 550     content_->SetAnchorPoint(gfx::PointF()); | 
| 551     content_->SetIsDrawable(true); | 551     content_->SetIsDrawable(true); | 
| 552     content_->SetForceRenderSurface(true); | 552     content_->SetForceRenderSurface(true); | 
| 553     // Filters require us to create an offscreen context. | 553     // Filters require us to create an offscreen context. | 
| 554     WebKit::WebFilterOperations filters; | 554     FilterOperations filters; | 
| 555     filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(0.5f)); | 555     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f)); | 
| 556     content_->SetFilters(filters); | 556     content_->SetFilters(filters); | 
| 557     content_->SetBackgroundFilters(filters); | 557     content_->SetBackgroundFilters(filters); | 
| 558 | 558 | 
| 559     root_->AddChild(content_); | 559     root_->AddChild(content_); | 
| 560 | 560 | 
| 561     layer_tree_host()->SetRootLayer(root_); | 561     layer_tree_host()->SetRootLayer(root_); | 
| 562     LayerTreeHostContextTest::SetupTree(); | 562     LayerTreeHostContextTest::SetupTree(); | 
| 563   } | 563   } | 
| 564 | 564 | 
| 565   virtual void BeginTest() OVERRIDE { | 565   virtual void BeginTest() OVERRIDE { | 
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1590         LayerTreeHost::Create(this, settings, impl_ccthread.Pass()); | 1590         LayerTreeHost::Create(this, settings, impl_ccthread.Pass()); | 
| 1591     EXPECT_FALSE(layer_tree_host); | 1591     EXPECT_FALSE(layer_tree_host); | 
| 1592   } | 1592   } | 
| 1593 }; | 1593 }; | 
| 1594 | 1594 | 
| 1595 SINGLE_AND_MULTI_THREAD_TEST_F( | 1595 SINGLE_AND_MULTI_THREAD_TEST_F( | 
| 1596     LayerTreeHostTestCannotCreateIfCannotCreateOutputSurface); | 1596     LayerTreeHostTestCannotCreateIfCannotCreateOutputSurface); | 
| 1597 | 1597 | 
| 1598 }  // namespace | 1598 }  // namespace | 
| 1599 }  // namespace cc | 1599 }  // namespace cc | 
| OLD | NEW | 
|---|