Prepare ui/compositor for WebLayer type change

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/WebLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.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"
 
 class SkCanvas;
@@ skipping 224 matching lines @@
 
   // WebContentLayerClient
   virtual void paintContents(WebKit::WebCanvas*,
                              const WebKit::WebRect& clip,
 #if defined(WEBCONTENTLAYERCLIENT_FLOAT_OPAQUE_RECT)
                              WebKit::WebFloatRect& opaque);
 #else
                              WebKit::WebRect& opaque);
 #endif
 
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+  WebKit::WebLayer* web_layer() { return web_layer_; }
+#else
   WebKit::WebLayer web_layer() { return web_layer_; }
+#endif
 
   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
@@ skipping 94 matching lines @@
   // We keep this reference for the case that if the mask layer gets deleted
   // while attached to the main layer before the main layer is deleted.
   Layer* layer_mask_back_link_;
 
   std::string name_;
 
   LayerDelegate* delegate_;
 
   scoped_ptr<LayerAnimator> animator_;
 
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+  // Ownership of the layer is held through one of the strongly typed layer
+  // pointers, depending on which sort of layer this is.
+  scoped_ptr<WebKit::WebContentLayer> content_layer_;
+  scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_;
+  scoped_ptr<WebKit::WebSolidColorLayer> solid_color_layer_;
+  WebKit::WebLayer* web_layer_;
+#else
   WebKit::WebLayer web_layer_;
+#endif
   bool web_layer_is_accelerated_;
   bool show_debug_borders_;
 
   // If true, the layer scales the canvas and the texture with the device scale
   // factor as appropriate. When true, the texture size is in DIP.
   bool scale_content_;
 
   // A cached copy of |Compositor::device_scale_factor()|.
   float device_scale_factor_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_