Partial revert of 146621

ui/compositor/layer.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_LAYER_H_
 #define UI_COMPOSITOR_LAYER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
@@ skipping 10 matching lines @@
 // A Layer can also be created without a texture, in which case it renders
 // nothing and is simply used as a node in a hierarchy of layers.
 // Coordinate system used in layers is DIP (Density Independent Pixel)
 // coordinates unless explicitly mentioned as pixel coordinates.
 //
 // 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),
-      NON_EXPORTED_BASE(public WebKit::WebExternalTextureLayerClient) {
+      NON_EXPORTED_BASE(public WebKit::WebContentLayerClient) {
  public:
   Layer();
   explicit Layer(LayerType type);
   virtual ~Layer();
 
   // Retrieves the Layer's compositor. The Layer will walk up its parent chain
   // to locate it. Returns NULL if the Layer is not attached to a compositor.
   Compositor* GetCompositor();
 
   // Called by the compositor when the Layer is set as its root Layer. This can
@@ skipping 196 matching lines @@
   virtual void paintContents(WebKit::WebCanvas*,
                              const WebKit::WebRect& clip,
 #if defined(WEBCONTENTLAYERCLIENT_FLOAT_OPAQUE_RECT)
                              WebKit::WebFloatRect& opaque);
 #else
                              WebKit::WebRect& opaque);
 #endif
 
   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
   // impact, and is only used for benchmarking/testing purpose.
   void SetForceRenderSurface(bool force);
   bool force_render_surface() const { return force_render_surface_; }
 
  private:
   // TODO(vollick): Eventually, if a non-leaf node has an opacity of less than
   // 1.0, we'll render to a separate texture, and then apply the alpha.
@@ skipping 110 matching lines @@
 
   // A cached copy of |Compositor::device_scale_factor()|.
   float device_scale_factor_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_