Android: Explicitly tear down LayerTreeHost first, take 2

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 #include <utility>
@@ skipping 242 matching lines @@
   DCHECK(root_window);
   root_window->AttachCompositor(this);
   CreateLayerTreeHost();
   resource_manager_.Init(host_.get());
 }
 
 CompositorImpl::~CompositorImpl() {
   root_window_->DetachCompositor();
   // Clean-up any surface references.
   SetSurface(NULL);
-
-  // Explicitly tear down everything cc-related before destroying |this|.
-  host_.reset();
 }
 
 void CompositorImpl::PostComposite(CompositingTrigger trigger) {
   DCHECK(host_->visible());
   DCHECK(needs_composite_);
   DCHECK(trigger == COMPOSITE_IMMEDIATELY || trigger == COMPOSITE_EVENTUALLY);
 
   if (will_composite_immediately_ ||
       (trigger == COMPOSITE_EVENTUALLY && WillComposite())) {
     // We will already composite soon enough.
@@ skipping 527 matching lines @@
 
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_->visible())
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content