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

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index c170c4fa8b2c3e88208c651d5f22929d10261a71..b32e4135572042b2f0fc5fe18aacabbb65a8d812 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRegion.h"
@@ -41,9 +42,10 @@ class Texture;
 // NOTE: unlike Views, each Layer does *not* own its children views. If you
 // delete a Layer and it has children, the parent of each child layer is set to
 // NULL, but the children are not deleted.
-class COMPOSITOR_EXPORT Layer :
-    public LayerAnimationDelegate,
-    NON_EXPORTED_BASE(public WebKit::WebContentLayerClient) {
+class COMPOSITOR_EXPORT Layer
+    : public LayerAnimationDelegate,
+      NON_EXPORTED_BASE(public WebKit::WebContentLayerClient),
+      NON_EXPORTED_BASE(public WebKit::WebExternalTextureLayerClient) {
  public:
   Layer();
   explicit Layer(LayerType type);
@@ -236,6 +238,11 @@ class COMPOSITOR_EXPORT Layer :
 
   WebKit::WebLayer web_layer() { return web_layer_; }
 
+  // WebExternalTextureLayerClient
+  virtual unsigned prepareTexture(
+      WebKit::WebTextureUpdater& /* updater */) OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D* context() OVERRIDE;
+
   float device_scale_factor() const { return device_scale_factor_; }
 
   // Forces a render surface to be used on this layer. This has no positive