Aura: Keep the external texture until we've updated compositor references to it.

ui/compositor/layer.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 "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 469 matching lines @@
   cc_layer_->SetIsDrawable(IsDrawn());
 }
 
 void Layer::SwitchCCLayerForTest() {
   scoped_refptr<cc::ContentLayer> new_layer = cc::ContentLayer::Create(this);
   SwitchToLayer(new_layer);
   content_layer_ = new_layer;
 }
 
 void Layer::SetExternalTexture(Texture* texture) {
+  // Hold a ref to the old |Texture| until we have updated all
+  // compositor references to the texture id that it holds.
+  scoped_refptr<ui::Texture> old_texture = texture_;
+
   DCHECK_EQ(type_, LAYER_TEXTURED);
   DCHECK(!solid_color_layer_);
   bool has_texture = !!texture;
   layer_updated_externally_ = has_texture;
   texture_ = texture;
   if (!!texture_layer_ != has_texture) {
     // Switch to a different type of layer.
     if (has_texture) {
       scoped_refptr<cc::TextureLayer> new_layer =
           cc::TextureLayer::Create(this);
@@ skipping 435 matching lines @@
   cc_layer_->SetBounds(ConvertSizeToPixel(this, size));
 }
 
 void Layer::RecomputePosition() {
   cc_layer_->SetPosition(gfx::ScalePoint(
         gfx::PointF(bounds_.x(), bounds_.y()),
         device_scale_factor_));
 }
 
 }  // namespace ui