Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient

ui/compositor/compositor.cc

Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 148a5bd28c782ebc0a5ebac6fa65742d4d092717..2d96b80f4d89527a853daa63df9ea53a079e2022 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -162,6 +162,9 @@ Compositor::Compositor(CompositorDelegate* delegate,
 }
 
 Compositor::~Compositor() {
+  // Clear out any pending callbacks.
+  didCommit();
+
   // Don't call |CompositorDelegate::ScheduleDraw| from this point.
   delegate_ = NULL;
   // There's a cycle between |root_web_layer_| and |host_|, which results in
@@ -342,6 +345,15 @@ WebKit::WebGraphicsContext3D* Compositor::createContext3D() {
 void Compositor::didRebindGraphicsContext(bool success) {
 }
 
+void Compositor::didCommit() {

[piman, 2012/07/09 22:40:01]

Can you add a comment that this is only called in the compositor thread case?

[jonathan.backer, 2012/07/11 21:02:03]

I was wrong. It's not. But it's only called during a draw in the single-threaded
case, whereas it can be called many times per draw in the threaded case.

+  for (std::vector< base::Callback<void(Compositor*)> >::const_iterator
+      it = did_commit_callbacks_.begin();
+      it != did_commit_callbacks_.end(); ++it) {
+    it->Run(this);
+  }
+  did_commit_callbacks_.clear();
+}
+
 void Compositor::didCommitAndDrawFrame() {
   // TODO(backer): Plumb through an earlier impl side will start.
   if (g_compositor_thread)
@@ -363,6 +375,14 @@ void Compositor::scheduleComposite() {
     ScheduleDraw();
 }
 
+void Compositor::AddDidCommitCallback(
+    const base::Callback<void(ui::Compositor*)>& callback) {
+  if (g_compositor_thread)
+    did_commit_callbacks_.push_back(callback);
+  else
+    callback.Run(this);
+}
+
 void Compositor::SwizzleRGBAToBGRAAndFlip(unsigned char* pixels,
                                           const gfx::Size& image_size) {
   // Swizzle from RGBA to BGRA