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

ui/compositor/compositor.h

 // 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.
 
 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
 #define UI_COMPOSITOR_COMPOSITOR_H_
 #pragma once
 
+#include <vector>
+
+#include "base/callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
@@ skipping 76 matching lines @@
 // Texture provide an abstraction over the external texture that can be passed
 // to a layer.
 class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> {
  public:
   Texture(bool flipped, const gfx::Size& size);
 
   unsigned int texture_id() const { return texture_id_; }
   void set_texture_id(unsigned int id) { texture_id_ = id; }
   bool flipped() const { return flipped_; }
   gfx::Size size() const { return size_; }
+  virtual WebKit::WebGraphicsContext3D* hostContext3D() = 0;

[piman, 2012/07/12 00:18:09]

nit: chrome style.

[jonathan.backer, 2012/07/12 13:53:22]

Done.

 
  protected:
   virtual ~Texture();
 
  private:
   friend class base::RefCounted<Texture>;
 
   unsigned int texture_id_;
   bool flipped_;
   gfx::Size size_;  // in pixel
@@ skipping 88 matching lines @@
   // Signals swap has aborted (e.g. lost context).
   void OnSwapBuffersAborted();
 
   // WebLayerTreeViewClient implementation.
   virtual void updateAnimations(double frameBeginTime);
   virtual void layout();
   virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                    float scaleFactor);
   virtual WebKit::WebGraphicsContext3D* createContext3D();
   virtual void didRebindGraphicsContext(bool success);
+  virtual void didCommit();
   virtual void didCommitAndDrawFrame();
   virtual void didCompleteSwapBuffers();
   virtual void scheduleComposite();
 
   int last_started_frame() { return last_started_frame_; }
   int last_ended_frame() { return last_ended_frame_; }
 
+  void AddDidCommitCallback(
+      const base::Callback<void(ui::Compositor*)>& callback);
+
  private:
   friend class base::RefCounted<Compositor>;
 
   // When reading back pixel data we often get RGBA rather than BGRA pixels and
   // and the image often needs to be flipped vertically.
   static void SwizzleRGBAToBGRAAndFlip(unsigned char* pixels,
                                        const gfx::Size& image_size);
 
   // Notifies the compositor that compositing is complete.
   void NotifyEnd();
@@ skipping 15 matching lines @@
   bool swap_posted_;
 
   // The device scale factor of the monitor that this compositor is compositing
   // layers on.
   float device_scale_factor_;
 
   int last_started_frame_;
   int last_ended_frame_;
 
   bool disable_schedule_composite_;
+
+  std::vector< base::Callback<void(ui::Compositor*)> >
+      did_commit_callbacks_;
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_COMPOSITOR_H_