aura: Use Layer::SetShowPaintedContent to stop showing external content

aura: Use Layer::SetShowPaintedContent to stop showing external content

Currently we use SetExternalTexture(NULL) or SetDelegatedFrame(NULL)
to switch back to showing painted content. This is kinda indirect,
and won't play nicely when SetExternalTexture() is removed, and when
we use a FrameProvider for delegated frames instead of pushing them
to the ui::Layer directly one at a time.

Instead, add SetShowPaintedContent() to switch to a content layer,
and disallow setting a NULL/empty texture or delegated frame.

Also View::SetExternalTexture() is not used, remove it so it doesn't
have to think about this change.

R=piman,sadrul
BUG=263069
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226502

[danakj, 2013-10-01 20:06:52]

sadrul: ui/aura ui/views
piman: the rest

[sadrul, 2013-10-01 20:38:59]

aura/ views/ lgtm

[piman, 2013-10-01 21:21:44]

lgtm

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer.cc
File ui/compositor/layer.cc (right):

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer.cc#new...
ui/compositor/layer.cc:554: scoped_refptr<ui::Texture> old_texture = texture_;
nit: I don't think that's necessary in this function. It's needed in the
SetExternalTexture case because we reset texture_ before we cleaned up the layer
in SwitchToLayer, but in this case, we SwitchToLayer first, so we already keep
the reference in texture_ correctly.

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer_unitte...
File ui/compositor/layer_unittest.cc (right):

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer_unitte...
ui/compositor/layer_unittest.cc:1356: cc::Layer* before = child->cc_layer();
Make |before| a scoped_refptr<cc::Layer>. If the layer type changes, the old
cc::Layer is freed, and the new one might be reallocated at the same address,
which would cause false positives and false negatives below.

[commit-bot: I haz the power, 2013-10-01 22:35:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/25596002/18001

[danakj, 2013-10-01 22:37:19]

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer.cc
File ui/compositor/layer.cc (right):

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer.cc#new...
ui/compositor/layer.cc:554: scoped_refptr<ui::Texture> old_texture = texture_;
On 2013/10/01 21:21:45, piman wrote:
> nit: I don't think that's necessary in this function. It's needed in the
> SetExternalTexture case because we reset texture_ before we cleaned up the
layer
> in SwitchToLayer, but in this case, we SwitchToLayer first, so we already keep
> the reference in texture_ correctly.

Done.

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer_unitte...
File ui/compositor/layer_unittest.cc (right):

https://codereview.chromium.org/25596002/diff/9001/ui/compositor/layer_unitte...
ui/compositor/layer_unittest.cc:1356: cc::Layer* before = child->cc_layer();
On 2013/10/01 21:21:45, piman wrote:
> Make |before| a scoped_refptr<cc::Layer>. If the layer type changes, the old
> cc::Layer is freed, and the new one might be reallocated at the same address,
> which would cause false positives and false negatives below.

Oh, right. Done.

[commit-bot: I haz the power, 2013-10-01 22:45:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/25596002/18001

[commit-bot: I haz the power, 2013-10-01 23:44:58]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-02 16:37:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/25596002/18001

[commit-bot: I haz the power, 2013-10-02 18:08:44]

Change committed as 226502