diff options
author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 21:20:54 +0000 |
---|---|---|
committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 21:20:54 +0000 |
commit | a668cd743ce83c2cf6226fe73e708427f19d7261 (patch) | |
tree | 12f68c2675a41b537fd2795deff16012f8fc507a /content/test | |
parent | c85e1a8a9bb5ae45fe48e03c500156426127bdda (diff) | |
download | chromium_src-a668cd743ce83c2cf6226fe73e708427f19d7261.zip chromium_src-a668cd743ce83c2cf6226fe73e708427f19d7261.tar.gz chromium_src-a668cd743ce83c2cf6226fe73e708427f19d7261.tar.bz2 |
cc: Defer first OutputSurface creation until client is ready
Remove the |first_output_surface| which was not used before
the client signals ready.
This allows the client to wait before creating a graphics context
until the gpu thread and client channel are set up.
BUG=270179
R=danakj@chromium.org, jamesr@chromium.org, jochen@chromium.org
Review URL: https://codereview.chromium.org/85693007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r-- | content/test/test_webkit_platform_support.cc | 3 | ||||
-rw-r--r-- | content/test/web_layer_tree_view_impl_for_testing.cc | 6 | ||||
-rw-r--r-- | content/test/web_layer_tree_view_impl_for_testing.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc index bc93658..ea6ea71 100644 --- a/content/test/test_webkit_platform_support.cc +++ b/content/test/test_webkit_platform_support.cc @@ -303,8 +303,7 @@ TestWebKitPlatformSupport::createLayerTreeViewForTesting() { scoped_ptr<WebLayerTreeViewImplForTesting> view( new WebLayerTreeViewImplForTesting()); - if (!view->Initialize()) - return NULL; + view->Initialize(); return view.release(); } diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc index 1470e03..d29e68b 100644 --- a/content/test/web_layer_tree_view_impl_for_testing.cc +++ b/content/test/web_layer_tree_view_impl_for_testing.cc @@ -36,7 +36,7 @@ WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting() {} WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {} -bool WebLayerTreeViewImplForTesting::Initialize() { +void WebLayerTreeViewImplForTesting::Initialize() { cc::LayerTreeSettings settings; // For web contents, layer transforms should scale up the contents of layers @@ -47,9 +47,7 @@ bool WebLayerTreeViewImplForTesting::Initialize() { settings.accelerated_animation_enabled = true; layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings); - if (!layer_tree_host_) - return false; - return true; + DCHECK(layer_tree_host_); } void WebLayerTreeViewImplForTesting::setSurfaceReady() { diff --git a/content/test/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h index 6fec0e3..4f496bb 100644 --- a/content/test/web_layer_tree_view_impl_for_testing.h +++ b/content/test/web_layer_tree_view_impl_for_testing.h @@ -26,7 +26,7 @@ class WebLayerTreeViewImplForTesting WebLayerTreeViewImplForTesting(); virtual ~WebLayerTreeViewImplForTesting(); - bool Initialize(); + void Initialize(); // blink::WebLayerTreeView implementation. virtual void setSurfaceReady(); |