summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_client.h
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 03:13:20 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 03:13:20 +0000
commit04049fc12bc16db65bbbdb47d17a8d3f8d9a7b00 (patch)
treef3b092f06b4751fb197ff1622c0feb0d28bf7bbe /cc/trees/layer_tree_host_client.h
parent577df9afb7a24d5aa825a606382ed8988fa6b5b9 (diff)
downloadchromium_src-04049fc12bc16db65bbbdb47d17a8d3f8d9a7b00.zip
chromium_src-04049fc12bc16db65bbbdb47d17a8d3f8d9a7b00.tar.gz
chromium_src-04049fc12bc16db65bbbdb47d17a8d3f8d9a7b00.tar.bz2
Merge cc initialization paths
Code path between first initialization and recreate on context lost are merged. Do this by changing the first initialization behavior to match recreate. Now both are kicked off by the scheduler and blocks the main thread on the impl thread. The scheduler is started in output surface lost state and immediately schedules recreation. This means the first initialization in thread mode is no longer synchronous. BUG=233664, 230197 This has been tried many many times. NOTRY=true Reverted twice due to breaking WebGLInfobarTest: Committed in r196480. Reverted in r196509. Committed in r196708. Reverted in r196790. Fix for WebGLInfobarTest landed in r197235. WebViewTest.Shim became flaky on chromeos but was already flaky without this. Disabled it in r197497. Review URL: https://chromiumcodereview.appspot.com/12544032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_client.h')
-rw-r--r--cc/trees/layer_tree_host_client.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_client.h b/cc/trees/layer_tree_host_client.h
index 0bef011..324b93f 100644
--- a/cc/trees/layer_tree_host_client.h
+++ b/cc/trees/layer_tree_host_client.h
@@ -28,6 +28,7 @@ class LayerTreeHostClient {
virtual void ApplyScrollAndScale(gfx::Vector2d scroll_delta,
float page_scale) = 0;
virtual scoped_ptr<OutputSurface> CreateOutputSurface() = 0;
+ // TODO(boliu): Rename to DidInitializeOutputSurface.
virtual void DidRecreateOutputSurface(bool success) = 0;
virtual scoped_ptr<InputHandlerClient> CreateInputHandlerClient() = 0;
virtual void WillCommit() = 0;
@@ -46,7 +47,7 @@ class LayerTreeHostClient {
OffscreenContextProviderForCompositorThread() = 0;
// This hook is for testing.
- virtual void WillRetryRecreateOutputSurface() {}
+ virtual void DidFailToInitializeOutputSurface() {}
protected:
virtual ~LayerTreeHostClient() {}