Make ReflectorImpl use mailboxes

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/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 624 matching lines @@
     layer->SetBounds(bounds);
     return layer;
   }
 
  private:
   scoped_ptr<NullLayerDelegate> default_layer_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerWithNullDelegateTest);
 };
 
-class FakeTexture : public Texture {
- public:
-  FakeTexture(bool flipped, const gfx::Size& size, float device_scale_factor)
-      : Texture(flipped, size, device_scale_factor) {}
-
-  virtual unsigned int PrepareTexture() OVERRIDE { return 0; }
-
- protected:
-  virtual ~FakeTexture() {}
-};
-
 TEST_F(LayerWithNullDelegateTest, EscapedDebugNames) {
   scoped_ptr<Layer> layer(CreateLayer(LAYER_NOT_DRAWN));
   std::string name = "\"\'\\/\b\f\n\r\t\n";
   layer->set_name(name);
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info =
     layer->TakeDebugInfo();
   EXPECT_TRUE(!!debug_info);
   std::string json;
   debug_info->AppendAsTraceFormat(&json);
   base::JSONReader json_reader;
   scoped_ptr<base::Value> debug_info_value(json_reader.ReadToValue(json));
   EXPECT_TRUE(!!debug_info_value);
   EXPECT_TRUE(debug_info_value->IsType(base::Value::TYPE_DICTIONARY));
   base::DictionaryValue* dictionary = 0;
   EXPECT_TRUE(debug_info_value->GetAsDictionary(&dictionary));
   std::string roundtrip;
   EXPECT_TRUE(dictionary->GetString("layer_name", &roundtrip));
   EXPECT_EQ(name, roundtrip);
 }
 
+void ReturnMailbox(uint32 sync_point, bool is_lost) {}

[danakj, 2014/04/08 16:08:01]

We should make sure this gets called in tests in the places you've added Run()
in layer.cc?

[piman, 2014/04/08 23:17:46]

Done.

+
 TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) {
   scoped_ptr<Layer> l1(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(20, 20, 400, 400)));
   l1->SetFillsBoundsOpaquely(true);
   l1->SetForceRenderSurface(true);
   l1->SetVisible(false);
 
   EXPECT_EQ(gfx::PointF().ToString(),
             l1->cc_layer()->anchor_point().ToString());
   EXPECT_TRUE(l1->cc_layer()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer()->force_render_surface());
   EXPECT_TRUE(l1->cc_layer()->hide_layer_and_subtree());
 
   cc::Layer* before_layer = l1->cc_layer();
 
-  scoped_refptr<Texture> texture =
-      new FakeTexture(false, gfx::Size(10, 10), 1.f);
-  l1->SetExternalTexture(texture.get());
+  cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), 0, 0);
+  l1->SetTextureMailbox(
+      mailbox,
+      cc::SingleReleaseCallback::Create(base::Bind(ReturnMailbox)),
+      gfx::Size(1, 1));
 
   EXPECT_NE(before_layer, l1->cc_layer());
 
   EXPECT_EQ(gfx::PointF().ToString(),
             l1->cc_layer()->anchor_point().ToString());
   EXPECT_TRUE(l1->cc_layer()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer()->force_render_surface());
   EXPECT_TRUE(l1->cc_layer()->hide_layer_and_subtree());
 }
@@ skipping 804 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