diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 07:24:24 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 07:24:24 +0000 |
| commit | fbe89f77b847566e6ca80f5667df5bb7b3cccc53 (patch) | |
| tree | 52ce8a300c3921097972530ace4b4ad2b29d722c /cc/trees/layer_tree_host_impl.h | |
| parent | f71e84058d13cbc3198e72433c9933fd0e56d3b5 (diff) | |
| download | chromium_src-fbe89f77b847566e6ca80f5667df5bb7b3cccc53.zip chromium_src-fbe89f77b847566e6ca80f5667df5bb7b3cccc53.tar.gz chromium_src-fbe89f77b847566e6ca80f5667df5bb7b3cccc53.tar.bz2 | |
Makes the resource provider and tile manager optional in LayerTreeHostImpl.
This is used with ForcedDrawToSoftwareDevice / tile-free rendering, in the
android webview synchronous compositor, to enable just-in-time software
renderer and prepare way for lazy GL render initialization (crbug.com/230197)
(Inc. minor fix to tracing category used in SyncInputEventFilter)
BUG=230226
Review URL: https://chromiumcodereview.appspot.com/14918013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 72b06b5..3aebeec 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -432,9 +432,12 @@ class CC_EXPORT LayerTreeHostImpl void StartScrollbarAnimationRecursive(LayerImpl* layer, base::TimeTicks time); scoped_ptr<OutputSurface> output_surface_; + + // |resource_provider_| and |tile_manager_| can be NULL, e.g. when using tile- + // free rendering - see OutputSurface::ForcedDrawToSoftwareDevice(). scoped_ptr<ResourceProvider> resource_provider_; - scoped_ptr<Renderer> renderer_; scoped_ptr<TileManager> tile_manager_; + scoped_ptr<Renderer> renderer_; // Tree currently being drawn. scoped_ptr<LayerTreeImpl> active_tree_; |