aura: Fix layer type change logic.

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 391 matching lines @@
 }
 
 void Layer::SetExternalTexture(Texture* texture) {
   DCHECK_EQ(type_, LAYER_TEXTURED);
   layer_updated_externally_ = !!texture;
   texture_ = texture;
   if (web_layer_is_accelerated_ != layer_updated_externally_) {
     // Switch to a different type of layer.
 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
     web_layer_->removeAllChildren();
-    content_layer_.reset();
-    solid_color_layer_.reset();
+    scoped_ptr<WebKit::WebContentLayer> old_content_layer(
+        content_layer_.release());
+    scoped_ptr<WebKit::WebSolidColorLayer> old_solid_layer(
+        solid_color_layer_.release());
+    scoped_ptr<WebKit::WebExternalTextureLayer> old_texture_layer(
+        texture_layer_.release());
     WebKit::WebLayer* new_layer = NULL;
 #else
     web_layer_.removeAllChildren();
     WebKit::WebLayer new_layer;
 #endif
     if (layer_updated_externally_) {
 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
       texture_layer_.reset(WebKit::WebExternalTextureLayer::create());
       texture_layer_->setFlipped(texture_->flipped());
       new_layer = texture_layer_->layer();
 #else
       WebKit::WebExternalTextureLayer texture_layer =
           WebKit::WebExternalTextureLayer::create();
       texture_layer.setFlipped(texture_->flipped());
       new_layer = texture_layer;
 #endif
     } else {
 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
-      texture_layer_.reset();
-      solid_color_layer_.reset();
       content_layer_.reset(WebKit::WebContentLayer::create(this));
       new_layer = content_layer_->layer();
 #else
       new_layer = WebKit::WebContentLayer::create(this);
 #endif
     }
     if (parent_) {
 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
       DCHECK(parent_->web_layer_);
       parent_->web_layer_->replaceChild(web_layer_, new_layer);
@@ skipping 469 matching lines @@
   if (!opaque)
     color |= 0xFF;
 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
   web_layer_->setDebugBorderColor(color);
 #else
   web_layer_.setDebugBorderColor(color);
 #endif
 }
 
 }  // namespace ui