aura: Fix layer type change logic.

aura: Fix layer type change logic.

BUG=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=152530

[jamesr, 2012-08-21 04:52:50]

Lgtm. Sorry about that! I definitely should have tested this more
thoroughly manually, but were there any automated tests I should have been
watching?
On Aug 20, 2012 9:46 PM, <piman@chromium.org> wrote:

> Reviewers: jamesr,
>
> Description:
> aura: Fix layer type change logic.
>
> BUG=None
>
>
> Please review this at
https://chromiumcodereview.**appspot.com/10827435/<https://chromiumcodereview...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M ui/compositor/layer.cc
>
>
> Index: ui/compositor/layer.cc
> diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
> index 94caf4bd2a178e5357a50a6b00c905**f6f7e2ab18..**
> b1e8f8f347c3db271576e220d72371**7ea6d735af 100644
> --- a/ui/compositor/layer.cc
> +++ b/ui/compositor/layer.cc
> @@ -409,8 +409,12 @@ void Layer::SetExternalTexture(**Texture* texture) {
>      // 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()**;
> @@ -429,8 +433,6 @@ void Layer::SetExternalTexture(**Texture* texture) {
>  #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
>
>
>

[commit-bot: I haz the power, 2012-08-21 05:55:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/10827435/1

[commit-bot: I haz the power, 2012-08-21 08:25:24]

Change committed as 152530