| Index: content/browser/renderer_host/compositor_impl_android.h
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
|
| index 0072979eb1b98c700a959645f3d05f8bbb5ff455..522aa5f8ce44d12e8df72e02af3e03210d272166 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.h
|
| +++ b/content/browser/renderer_host/compositor_impl_android.h
|
| @@ -162,6 +162,8 @@ class CONTENT_EXPORT CompositorImpl
|
| scoped_refptr<cc::Layer> root_layer_;
|
| scoped_refptr<cc::Layer> subroot_layer_;
|
|
|
| + // Destruction order matters here:
|
| + base::ObserverList<VSyncObserver, true> observer_list_;
|
| scoped_ptr<cc::LayerTreeHost> host_;
|
| ui::ResourceManagerImpl resource_manager_;
|
|
|
| @@ -222,8 +224,6 @@ class CONTENT_EXPORT CompositorImpl
|
|
|
| gpu::Capabilities gpu_capabilities_;
|
|
|
| - base::ObserverList<VSyncObserver, true> observer_list_;
|
| -
|
| base::WeakPtrFactory<CompositorImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
|
|
|