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

ui/compositor/layer_unittest.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1326 matching lines @@
   compositor()->SetScaleAndSize(2.f, gfx::Size(1000, 1000));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(20, 20).ToString());
 
   // Low-DPI content on hi-DPI layer.
   child->SetDelegatedFrame(MakeFrameData(gfx::Size(10, 10)), gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(20, 20).ToString());
 }
 
+TEST_F(LayerWithDelegateTest, ExternalContent) {
+  scoped_ptr<Layer> root(CreateNoTextureLayer(gfx::Rect(0, 0, 1000, 1000)));
+  scoped_ptr<Layer> child(CreateLayer(LAYER_TEXTURED));
+
+  child->SetBounds(gfx::Rect(0, 0, 10, 10));
+  child->SetVisible(true);
+  root->Add(child.get());
+
+  // The layer is already showing painted content, so the cc layer won't change.
+  cc::Layer* before = child->cc_layer();

[piman, 2013/10/01 21:21:45]

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.

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

Oh, right. Done.

+  child->SetShowPaintedContent();
+  EXPECT_TRUE(child->cc_layer());
+  EXPECT_EQ(before, child->cc_layer());
+
+  // Showing delegated content changes the underlying cc layer.
+  before = child->cc_layer();
+  child->SetDelegatedFrame(MakeFrameData(gfx::Size(10, 10)), gfx::Size(10, 10));
+  EXPECT_TRUE(child->cc_layer());
+  EXPECT_NE(before, child->cc_layer());
+
+  // Changing to painted content should change the underlying cc layer.
+  before = child->cc_layer();
+  child->SetShowPaintedContent();
+  EXPECT_TRUE(child->cc_layer());
+  EXPECT_NE(before, child->cc_layer());
+}
+
 // Tests Layer::AddThreadedAnimation and Layer::RemoveThreadedAnimation.
 TEST_F(LayerWithRealCompositorTest, AddRemoveThreadedAnimations) {
   scoped_ptr<Layer> root(CreateLayer(LAYER_TEXTURED));
   scoped_ptr<Layer> l1(CreateLayer(LAYER_TEXTURED));
   scoped_ptr<Layer> l2(CreateLayer(LAYER_TEXTURED));
 
   l1->SetAnimator(LayerAnimator::CreateImplicitAnimator());
   l2->SetAnimator(LayerAnimator::CreateImplicitAnimator());
 
   EXPECT_FALSE(l1->HasPendingThreadedAnimations());
@@ skipping 49 matching lines @@
   l1->SetOpacity(0.5f);
 
   // Change l1's cc::Layer.
   l1->SwitchCCLayerForTest();
 
   // Ensure that the opacity animation completed.
   EXPECT_FLOAT_EQ(l1->opacity(), 0.5f);
 }
 
 }  // namespace ui