| Index: cc/blink/web_layer_impl.h
|
| diff --git a/content/renderer/compositor_bindings/web_layer_impl.h b/cc/blink/web_layer_impl.h
|
| similarity index 86%
|
| rename from content/renderer/compositor_bindings/web_layer_impl.h
|
| rename to cc/blink/web_layer_impl.h
|
| index f77439a58d45dac22f5db4cdcd3799016973b293..3a8130e30b4b068fa45108b7cbf1bdc3aa123bf2 100644
|
| --- a/content/renderer/compositor_bindings/web_layer_impl.h
|
| +++ b/cc/blink/web_layer_impl.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
|
| -#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
|
| +#ifndef CC_BLINK_WEB_LAYER_IMPL_H_
|
| +#define CC_BLINK_WEB_LAYER_IMPL_H_
|
|
|
| #include <string>
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/blink/cc_blink_export.h"
|
| #include "cc/layers/layer_client.h"
|
| -#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebCString.h"
|
| #include "third_party/WebKit/public/platform/WebColor.h"
|
| #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
|
| @@ -23,10 +23,6 @@
|
| #include "third_party/WebKit/public/platform/WebVector.h"
|
| #include "third_party/skia/include/utils/SkMatrix44.h"
|
|
|
| -namespace cc {
|
| -class Layer;
|
| -}
|
| -
|
| namespace blink {
|
| class WebFilterOperations;
|
| class WebLayerClient;
|
| @@ -39,22 +35,24 @@ class ConvertableToTraceFormat;
|
| }
|
| }
|
|
|
| -namespace content {
|
| +namespace cc {
|
| +class Layer;
|
| +}
|
| +
|
| +namespace cc_blink {
|
|
|
| class WebToCCAnimationDelegateAdapter;
|
|
|
| class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| public:
|
| - CONTENT_EXPORT WebLayerImpl();
|
| - CONTENT_EXPORT explicit WebLayerImpl(
|
| - scoped_refptr<cc::Layer>);
|
| + CC_BLINK_EXPORT WebLayerImpl();
|
| + CC_BLINK_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>);
|
| virtual ~WebLayerImpl();
|
|
|
| static bool UsingPictureLayer();
|
| - CONTENT_EXPORT static void SetImplSidePaintingEnabled(
|
| - bool enabled);
|
| + CC_BLINK_EXPORT static void SetImplSidePaintingEnabled(bool enabled);
|
|
|
| - CONTENT_EXPORT cc::Layer* layer() const;
|
| + CC_BLINK_EXPORT cc::Layer* layer() const;
|
|
|
| // WebLayer implementation.
|
| virtual int id() const;
|
| @@ -85,13 +83,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| virtual void setTransform(const SkMatrix44& transform);
|
| virtual void setTransformOrigin(const blink::WebFloatPoint3D& point);
|
| virtual blink::WebFloatPoint3D transformOrigin() const;
|
| -
|
| - // FIXME: get rid of these once Blink is no longer using them.
|
| - virtual void setAnchorPoint(const blink::WebFloatPoint&);
|
| - virtual blink::WebFloatPoint anchorPoint() const;
|
| - virtual void setAnchorPointZ(float);
|
| - virtual float anchorPointZ() const;
|
| -
|
| virtual SkMatrix44 transform() const;
|
| virtual void setDrawsContent(bool draws_content);
|
| virtual bool drawsContent() const;
|
| @@ -140,8 +131,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| virtual void setWebLayerClient(blink::WebLayerClient* client);
|
|
|
| // LayerClient implementation.
|
| - virtual scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| - TakeDebugInfo() OVERRIDE;
|
| + virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo()
|
| + OVERRIDE;
|
|
|
| virtual void setScrollParent(blink::WebLayer* parent);
|
| virtual void setClipParent(blink::WebLayer* parent);
|
| @@ -156,7 +147,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
|
| };
|
|
|
| -} // namespace content
|
| -
|
| -#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
|
| +} // namespace cc_blink
|
|
|
| +#endif // CC_BLINK_WEB_LAYER_IMPL_H_
|
|
|