From 5ad6cd1527df386a22cb78b827960e3ca076802d Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Thu, 7 Mar 2013 01:37:45 +0000 Subject: Remove cross-repo OVERRIDE annotations and IWYU-ify comp bindings This removes OVERRIDE annotations for implementations of functions declared in WebKit from webkit/compositor_bindings/ and includes / forward declares all types used. Without this, it's impossible to refactor these interface R=enne@chromium.org Review URL: https://chromiumcodereview.appspot.com/12481008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186580 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/compositor_bindings/web_animation_impl.h | 21 ++-- .../compositor_bindings/web_content_layer_impl.h | 12 +- .../web_external_texture_layer_impl.h | 17 +-- .../web_float_animation_curve_impl.h | 11 +- webkit/compositor_bindings/web_image_layer_impl.h | 5 +- .../web_io_surface_layer_impl.h | 5 +- webkit/compositor_bindings/web_layer_impl.h | 131 +++++++++++---------- .../web_layer_impl_fixed_bounds.h | 20 ++-- .../compositor_bindings/web_scrollbar_layer_impl.h | 8 +- .../web_solid_color_layer_impl.h | 5 +- .../web_to_ccinput_handler_adapter.cc | 18 ++- .../web_transform_animation_curve_impl.h | 12 +- .../web_transform_operations_impl.h | 22 ++-- webkit/compositor_bindings/web_video_layer_impl.h | 6 +- 14 files changed, 159 insertions(+), 134 deletions(-) (limited to 'webkit') diff --git a/webkit/compositor_bindings/web_animation_impl.h b/webkit/compositor_bindings/web_animation_impl.h index 0edc817..b70a3c6 100644 --- a/webkit/compositor_bindings/web_animation_impl.h +++ b/webkit/compositor_bindings/web_animation_impl.h @@ -12,6 +12,7 @@ namespace cc { class Animation; } namespace WebKit { +class WebAnimationCurve; class WebAnimationImpl : public WebAnimation { public: @@ -22,16 +23,16 @@ class WebAnimationImpl : public WebAnimation { virtual ~WebAnimationImpl(); // WebAnimation implementation - virtual int id() OVERRIDE; - virtual TargetProperty targetProperty() const OVERRIDE; - virtual int iterations() const OVERRIDE; - virtual void setIterations(int) OVERRIDE; - virtual double startTime() const OVERRIDE; - virtual void setStartTime(double monotonic_time) OVERRIDE; - virtual double timeOffset() const OVERRIDE; - virtual void setTimeOffset(double monotonic_time) OVERRIDE; - virtual bool alternatesDirection() const OVERRIDE; - virtual void setAlternatesDirection(bool) OVERRIDE; + virtual int id(); + virtual TargetProperty targetProperty() const; + virtual int iterations() const; + virtual void setIterations(int); + virtual double startTime() const; + virtual void setStartTime(double monotonic_time); + virtual double timeOffset() const; + virtual void setTimeOffset(double monotonic_time); + virtual bool alternatesDirection() const; + virtual void setAlternatesDirection(bool); scoped_ptr cloneToAnimation(); diff --git a/webkit/compositor_bindings/web_content_layer_impl.h b/webkit/compositor_bindings/web_content_layer_impl.h index 580ec49..be03f9a 100644 --- a/webkit/compositor_bindings/web_content_layer_impl.h +++ b/webkit/compositor_bindings/web_content_layer_impl.h @@ -26,12 +26,12 @@ class WebContentLayerImpl : public WebContentLayer, WebContentLayerClient*); // WebContentLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setDoubleSided(bool) OVERRIDE; - virtual void setBoundsContainPageScale(bool) OVERRIDE; - virtual bool boundsContainPageScale() const OVERRIDE; - virtual void setUseLCDText(bool) OVERRIDE; - virtual void setDrawCheckerboardForMissingTiles(bool) OVERRIDE; + virtual WebLayer* layer(); + virtual void setDoubleSided(bool); + virtual void setBoundsContainPageScale(bool); + virtual bool boundsContainPageScale() const; + virtual void setUseLCDText(bool); + virtual void setDrawCheckerboardForMissingTiles(bool); virtual void setAutomaticallyComputeRasterScale(bool); protected: diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.h b/webkit/compositor_bindings/web_external_texture_layer_impl.h index c37117c..e468a35 100644 --- a/webkit/compositor_bindings/web_external_texture_layer_impl.h +++ b/webkit/compositor_bindings/web_external_texture_layer_impl.h @@ -13,6 +13,7 @@ namespace WebKit { class WebLayerImpl; +struct WebFloatRect; class WebExternalTextureLayerImpl : public WebExternalTextureLayer, public cc::TextureLayerClient { @@ -22,14 +23,14 @@ class WebExternalTextureLayerImpl : public WebExternalTextureLayer, virtual ~WebExternalTextureLayerImpl(); // WebExternalTextureLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setTextureId(unsigned) OVERRIDE; - virtual void setFlipped(bool) OVERRIDE; - virtual void setUVRect(const WebFloatRect&) OVERRIDE; - virtual void setOpaque(bool) OVERRIDE; - virtual void setPremultipliedAlpha(bool) OVERRIDE; - virtual void willModifyTexture() OVERRIDE; - virtual void setRateLimitContext(bool) OVERRIDE; + virtual WebLayer* layer(); + virtual void setTextureId(unsigned); + virtual void setFlipped(bool); + virtual void setUVRect(const WebFloatRect&); + virtual void setOpaque(bool); + virtual void setPremultipliedAlpha(bool); + virtual void willModifyTexture(); + virtual void setRateLimitContext(bool); // TextureLayerClient implementation. virtual unsigned prepareTexture(cc::ResourceUpdateQueue&) OVERRIDE; diff --git a/webkit/compositor_bindings/web_float_animation_curve_impl.h b/webkit/compositor_bindings/web_float_animation_curve_impl.h index 24f452f..d20f243 100644 --- a/webkit/compositor_bindings/web_float_animation_curve_impl.h +++ b/webkit/compositor_bindings/web_float_animation_curve_impl.h @@ -15,6 +15,7 @@ class KeyframedFloatAnimationCurve; } namespace WebKit { +struct WebFloatKeyframe; class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve { public: @@ -22,18 +23,18 @@ class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve { virtual ~WebFloatAnimationCurveImpl(); // WebAnimationCurve implementation. - virtual AnimationCurveType type() const OVERRIDE; + virtual AnimationCurveType type() const; // WebFloatAnimationCurve implementation. - virtual void add(const WebFloatKeyframe&) OVERRIDE; - virtual void add(const WebFloatKeyframe&, TimingFunctionType) OVERRIDE; + virtual void add(const WebFloatKeyframe&); + virtual void add(const WebFloatKeyframe&, TimingFunctionType); virtual void add(const WebFloatKeyframe&, double x1, double y1, double x2, - double y2) OVERRIDE; + double y2); - virtual float getValue(double time) const OVERRIDE; + virtual float getValue(double time) const; scoped_ptr cloneToAnimationCurve() const; diff --git a/webkit/compositor_bindings/web_image_layer_impl.h b/webkit/compositor_bindings/web_image_layer_impl.h index 32f5cc8..77ec628 100644 --- a/webkit/compositor_bindings/web_image_layer_impl.h +++ b/webkit/compositor_bindings/web_image_layer_impl.h @@ -7,6 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { @@ -18,8 +19,8 @@ class WebImageLayerImpl : public WebImageLayer { virtual ~WebImageLayerImpl(); // WebImageLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setBitmap(SkBitmap) OVERRIDE; + virtual WebLayer* layer(); + virtual void setBitmap(SkBitmap); private: scoped_ptr layer_; diff --git a/webkit/compositor_bindings/web_io_surface_layer_impl.h b/webkit/compositor_bindings/web_io_surface_layer_impl.h index f7d3393..fe4dedb 100644 --- a/webkit/compositor_bindings/web_io_surface_layer_impl.h +++ b/webkit/compositor_bindings/web_io_surface_layer_impl.h @@ -7,6 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebIOSurfaceLayer.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { @@ -17,8 +18,8 @@ class WebIOSurfaceLayerImpl : public WebIOSurfaceLayer { virtual ~WebIOSurfaceLayerImpl(); // WebIOSurfaceLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setIOSurfaceProperties(unsigned io_surface_id, WebSize) OVERRIDE; + virtual WebLayer* layer(); + virtual void setIOSurfaceProperties(unsigned io_surface_id, WebSize); private: scoped_ptr layer_; diff --git a/webkit/compositor_bindings/web_layer_impl.h b/webkit/compositor_bindings/web_layer_impl.h index cb116b5..7fe37ca 100644 --- a/webkit/compositor_bindings/web_layer_impl.h +++ b/webkit/compositor_bindings/web_layer_impl.h @@ -6,7 +6,16 @@ #define WebLayerImpl_h #include "base/memory/ref_counted.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebColor.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/skia/include/utils/SkMatrix44.h" #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" namespace cc { class Layer; } @@ -15,6 +24,11 @@ namespace cc { class Layer; } class SkImageFilter; namespace WebKit { +class WebAnimationDelegate; +class WebFilterOperations; +class WebLayerScrollClient; +class WebTransformationMatrix; +struct WebFloatRect; class WebLayerImpl : public WebLayer { public: @@ -26,76 +40,75 @@ class WebLayerImpl : public WebLayer { WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::Layer* layer() const; // WebLayer implementation. - virtual int id() const OVERRIDE; - virtual void invalidateRect(const WebFloatRect&) OVERRIDE; - virtual void invalidate() OVERRIDE; - virtual void addChild(WebLayer*) OVERRIDE; - virtual void insertChild(WebLayer*, size_t index) OVERRIDE; - virtual void replaceChild(WebLayer* reference, WebLayer* new_layer) OVERRIDE; - virtual void removeFromParent() OVERRIDE; - virtual void removeAllChildren() OVERRIDE; - virtual void setAnchorPoint(const WebFloatPoint&) OVERRIDE; - virtual WebFloatPoint anchorPoint() const OVERRIDE; - virtual void setAnchorPointZ(float) OVERRIDE; - virtual float anchorPointZ() const OVERRIDE; - virtual void setBounds(const WebSize&) OVERRIDE; - virtual WebSize bounds() const OVERRIDE; - virtual void setMasksToBounds(bool) OVERRIDE; - virtual bool masksToBounds() const OVERRIDE; - virtual void setMaskLayer(WebLayer*) OVERRIDE; - virtual void setReplicaLayer(WebLayer*) OVERRIDE; - virtual void setOpacity(float) OVERRIDE; - virtual float opacity() const OVERRIDE; - virtual void setOpaque(bool) OVERRIDE; - virtual bool opaque() const OVERRIDE; - virtual void setPosition(const WebFloatPoint&) OVERRIDE; - virtual WebFloatPoint position() const OVERRIDE; - virtual void setSublayerTransform(const SkMatrix44&) OVERRIDE; - virtual void setSublayerTransform(const WebTransformationMatrix&) OVERRIDE; - virtual SkMatrix44 sublayerTransform() const OVERRIDE; - virtual void setTransform(const SkMatrix44&) OVERRIDE; - virtual void setTransform(const WebTransformationMatrix&) OVERRIDE; - virtual SkMatrix44 transform() const OVERRIDE; - virtual void setDrawsContent(bool) OVERRIDE; - virtual bool drawsContent() const OVERRIDE; - virtual void setPreserves3D(bool) OVERRIDE; - virtual void setUseParentBackfaceVisibility(bool) OVERRIDE; - virtual void setBackgroundColor(WebColor) OVERRIDE; + virtual int id() const; + virtual void invalidateRect(const WebFloatRect&); + virtual void invalidate(); + virtual void addChild(WebLayer*); + virtual void insertChild(WebLayer*, size_t index); + virtual void replaceChild(WebLayer* reference, WebLayer* new_layer); + virtual void removeFromParent(); + virtual void removeAllChildren(); + virtual void setAnchorPoint(const WebFloatPoint&); + virtual WebFloatPoint anchorPoint() const; + virtual void setAnchorPointZ(float); + virtual float anchorPointZ() const; + virtual void setBounds(const WebSize&); + virtual WebSize bounds() const; + virtual void setMasksToBounds(bool); + virtual bool masksToBounds() const; + virtual void setMaskLayer(WebLayer*); + virtual void setReplicaLayer(WebLayer*); + virtual void setOpacity(float); + virtual float opacity() const; + virtual void setOpaque(bool); + virtual bool opaque() const; + virtual void setPosition(const WebFloatPoint&); + virtual WebFloatPoint position() const; + virtual void setSublayerTransform(const SkMatrix44&); + virtual void setSublayerTransform(const WebTransformationMatrix&); + virtual SkMatrix44 sublayerTransform() const; + virtual void setTransform(const SkMatrix44&); + virtual void setTransform(const WebTransformationMatrix&); + virtual SkMatrix44 transform() const; + virtual void setDrawsContent(bool); + virtual bool drawsContent() const; + virtual void setPreserves3D(bool); + virtual void setUseParentBackfaceVisibility(bool); + virtual void setBackgroundColor(WebColor); virtual WebColor backgroundColor() const; virtual void setFilter(SkImageFilter*); - virtual void setFilters(const WebFilterOperations&) OVERRIDE; - virtual void setBackgroundFilters(const WebFilterOperations&) OVERRIDE; - virtual void setDebugName(WebString) OVERRIDE; - virtual void setAnimationDelegate(WebAnimationDelegate*) OVERRIDE; - virtual bool addAnimation(WebAnimation*) OVERRIDE; - virtual void removeAnimation(int animation_id) OVERRIDE; - virtual void removeAnimation(int animation_id, WebAnimation::TargetProperty) - OVERRIDE; - virtual void pauseAnimation(int animation_id, double time_offset) OVERRIDE; - virtual void suspendAnimations(double monotonic_time) OVERRIDE; - virtual void resumeAnimations(double monotonic_time) OVERRIDE; - virtual bool hasActiveAnimation() OVERRIDE; - virtual void transferAnimationsTo(WebLayer*) OVERRIDE; - virtual void setForceRenderSurface(bool) OVERRIDE; - virtual void setScrollPosition(WebPoint) OVERRIDE; - virtual WebPoint scrollPosition() const OVERRIDE; - virtual void setMaxScrollPosition(WebSize) OVERRIDE; + virtual void setFilters(const WebFilterOperations&); + virtual void setBackgroundFilters(const WebFilterOperations&); + virtual void setDebugName(WebString); + virtual void setAnimationDelegate(WebAnimationDelegate*); + virtual bool addAnimation(WebAnimation*); + virtual void removeAnimation(int animation_id); + virtual void removeAnimation(int animation_id, WebAnimation::TargetProperty); + virtual void pauseAnimation(int animation_id, double time_offset); + virtual void suspendAnimations(double monotonic_time); + virtual void resumeAnimations(double monotonic_time); + virtual bool hasActiveAnimation(); + virtual void transferAnimationsTo(WebLayer*); + virtual void setForceRenderSurface(bool); + virtual void setScrollPosition(WebPoint); + virtual WebPoint scrollPosition() const; + virtual void setMaxScrollPosition(WebSize); virtual WebSize maxScrollPosition() const; - virtual void setScrollable(bool) OVERRIDE; + virtual void setScrollable(bool); virtual bool scrollable() const; - virtual void setHaveWheelEventHandlers(bool) OVERRIDE; + virtual void setHaveWheelEventHandlers(bool); virtual bool haveWheelEventHandlers() const; - virtual void setShouldScrollOnMainThread(bool) OVERRIDE; + virtual void setShouldScrollOnMainThread(bool); virtual bool shouldScrollOnMainThread() const; - virtual void setNonFastScrollableRegion(const WebVector&) OVERRIDE; + virtual void setNonFastScrollableRegion(const WebVector&); virtual WebVector nonFastScrollableRegion() const; virtual void setTouchEventHandlerRegion(const WebVector&); virtual WebVector touchEventHandlerRegion() const; - virtual void setIsContainerForFixedPositionLayers(bool) OVERRIDE; + virtual void setIsContainerForFixedPositionLayers(bool); virtual bool isContainerForFixedPositionLayers() const; - virtual void setFixedToContainerLayer(bool) OVERRIDE; + virtual void setFixedToContainerLayer(bool); virtual bool fixedToContainerLayer() const; - virtual void setScrollClient(WebLayerScrollClient*) OVERRIDE; + virtual void setScrollClient(WebLayerScrollClient*); protected: scoped_refptr layer_; diff --git a/webkit/compositor_bindings/web_layer_impl_fixed_bounds.h b/webkit/compositor_bindings/web_layer_impl_fixed_bounds.h index 0e3a17f..5e64518 100644 --- a/webkit/compositor_bindings/web_layer_impl_fixed_bounds.h +++ b/webkit/compositor_bindings/web_layer_impl_fixed_bounds.h @@ -24,16 +24,16 @@ class WebLayerImplFixedBounds : public WebLayerImpl { virtual ~WebLayerImplFixedBounds(); // WebLayerImpl overrides. - virtual void invalidateRect(const WebFloatRect&) OVERRIDE; - virtual void setAnchorPoint(const WebFloatPoint&) OVERRIDE; - virtual void setBounds(const WebSize&) OVERRIDE; - virtual WebSize bounds() const OVERRIDE; - virtual void setSublayerTransform(const SkMatrix44&) OVERRIDE; - virtual void setSublayerTransform(const WebTransformationMatrix&) OVERRIDE; - virtual SkMatrix44 sublayerTransform() const OVERRIDE; - virtual void setTransform(const SkMatrix44&) OVERRIDE; - virtual void setTransform(const WebTransformationMatrix&) OVERRIDE; - virtual SkMatrix44 transform() const OVERRIDE; + virtual void invalidateRect(const WebFloatRect&); + virtual void setAnchorPoint(const WebFloatPoint&); + virtual void setBounds(const WebSize&); + virtual WebSize bounds() const; + virtual void setSublayerTransform(const SkMatrix44&); + virtual void setSublayerTransform(const WebTransformationMatrix&); + virtual SkMatrix44 sublayerTransform() const; + virtual void setTransform(const SkMatrix44&); + virtual void setTransform(const WebTransformationMatrix&); + virtual SkMatrix44 transform() const; WEBKIT_COMPOSITOR_BINDINGS_EXPORT void SetFixedBounds(const gfx::Size&); diff --git a/webkit/compositor_bindings/web_scrollbar_layer_impl.h b/webkit/compositor_bindings/web_scrollbar_layer_impl.h index ad40856..8fb4c7c 100644 --- a/webkit/compositor_bindings/web_scrollbar_layer_impl.h +++ b/webkit/compositor_bindings/web_scrollbar_layer_impl.h @@ -10,7 +10,11 @@ #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { + class WebLayerImpl; +class WebScrollbar; +class WebScrollbarThemeGeometry; +class WebScrollbarThemePainter; class WebScrollbarLayerImpl : public WebScrollbarLayer { public: @@ -21,8 +25,8 @@ class WebScrollbarLayerImpl : public WebScrollbarLayer { virtual ~WebScrollbarLayerImpl(); // WebScrollbarLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setScrollLayer(WebLayer*) OVERRIDE; + virtual WebLayer* layer(); + virtual void setScrollLayer(WebLayer*); private: scoped_ptr layer_; diff --git a/webkit/compositor_bindings/web_solid_color_layer_impl.h b/webkit/compositor_bindings/web_solid_color_layer_impl.h index 1a95020..6d841b4 100644 --- a/webkit/compositor_bindings/web_solid_color_layer_impl.h +++ b/webkit/compositor_bindings/web_solid_color_layer_impl.h @@ -6,6 +6,7 @@ #define WebSolidColorLayerImpl_h #include "base/memory/scoped_ptr.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebColor.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h" #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" @@ -18,8 +19,8 @@ class WebSolidColorLayerImpl : public WebSolidColorLayer { virtual ~WebSolidColorLayerImpl(); // WebSolidColorLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual void setBackgroundColor(WebColor) OVERRIDE; + virtual WebLayer* layer(); + virtual void setBackgroundColor(WebColor); private: scoped_ptr layer_; diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc index ee8e0c9..767c911 100644 --- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc +++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc @@ -41,33 +41,31 @@ class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient { virtual ~ClientAdapter() {} - virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) - OVERRIDE { + virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) { return static_cast( client_->scrollBegin( point, static_cast(type))); } - virtual bool scrollByIfPossible(WebPoint point, WebSize offset) OVERRIDE { + virtual bool scrollByIfPossible(WebPoint point, WebSize offset) { return client_->scrollBy(point, offset); } - virtual void scrollEnd() OVERRIDE { client_->scrollEnd(); } + virtual void scrollEnd() { client_->scrollEnd(); } - virtual void pinchGestureBegin() OVERRIDE { client_->pinchGestureBegin(); } + virtual void pinchGestureBegin() { client_->pinchGestureBegin(); } - virtual void pinchGestureUpdate(float magnify_delta, WebPoint anchor) - OVERRIDE { + virtual void pinchGestureUpdate(float magnify_delta, WebPoint anchor) { client_->pinchGestureUpdate(magnify_delta, anchor); } - virtual void pinchGestureEnd() OVERRIDE { client_->pinchGestureEnd(); } + virtual void pinchGestureEnd() { client_->pinchGestureEnd(); } virtual void startPageScaleAnimation(WebSize target_position, bool anchor_point, float page_scale, double start_time_sec, - double duration_sec) OVERRIDE { + double duration_sec) { base::TimeTicks start_time = base::TimeTicks::FromInternalValue( start_time_sec * base::Time::kMicrosecondsPerSecond); base::TimeDelta duration = base::TimeDelta::FromMicroseconds( @@ -76,7 +74,7 @@ class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient { target_position, anchor_point, page_scale, start_time, duration); } - virtual void scheduleAnimation() OVERRIDE { client_->scheduleAnimation(); } + virtual void scheduleAnimation() { client_->scheduleAnimation(); } virtual bool haveTouchEventHandlersAt(WebPoint point) { return client_->haveTouchEventHandlersAt(point); diff --git a/webkit/compositor_bindings/web_transform_animation_curve_impl.h b/webkit/compositor_bindings/web_transform_animation_curve_impl.h index 950e866..6c2aacc 100644 --- a/webkit/compositor_bindings/web_transform_animation_curve_impl.h +++ b/webkit/compositor_bindings/web_transform_animation_curve_impl.h @@ -16,24 +16,26 @@ class KeyframedTransformAnimationCurve; namespace WebKit { +class WebTransformKeyframe; + class WebTransformAnimationCurveImpl : public WebTransformAnimationCurve { public: WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebTransformAnimationCurveImpl(); virtual ~WebTransformAnimationCurveImpl(); // WebAnimationCurve implementation. - virtual AnimationCurveType type() const OVERRIDE; + virtual AnimationCurveType type() const; // WebTransformAnimationCurve implementation. - virtual void add(const WebTransformKeyframe&) OVERRIDE; - virtual void add(const WebTransformKeyframe&, TimingFunctionType) OVERRIDE; + virtual void add(const WebTransformKeyframe&); + virtual void add(const WebTransformKeyframe&, TimingFunctionType); virtual void add(const WebTransformKeyframe&, double x1, double y1, double x2, - double y2) OVERRIDE; + double y2); - virtual WebTransformationMatrix getValue(double time) const OVERRIDE; + virtual WebTransformationMatrix getValue(double time) const; scoped_ptr cloneToAnimationCurve() const; diff --git a/webkit/compositor_bindings/web_transform_operations_impl.h b/webkit/compositor_bindings/web_transform_operations_impl.h index 195969bc..a92f20d 100644 --- a/webkit/compositor_bindings/web_transform_operations_impl.h +++ b/webkit/compositor_bindings/web_transform_operations_impl.h @@ -10,6 +10,8 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h" #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" +namespace WebKit { class WebTransformationMatrix; } + namespace webkit { class WebTransformOperationsImpl : public WebKit::WebTransformOperations { @@ -20,17 +22,15 @@ class WebTransformOperationsImpl : public WebKit::WebTransformOperations { const cc::TransformOperations& AsTransformOperations() const; // Implementation of WebKit::WebTransformOperations methods - virtual bool canBlendWith(const WebKit::WebTransformOperations& other) const - OVERRIDE; - virtual void appendTranslate(double x, double y, double z) OVERRIDE; - virtual void appendRotate(double x, double y, double z, double degrees) - OVERRIDE; - virtual void appendScale(double x, double y, double z) OVERRIDE; - virtual void appendSkew(double x, double y) OVERRIDE; - virtual void appendPerspective(double depth) OVERRIDE; - virtual void appendMatrix(const WebKit::WebTransformationMatrix&) OVERRIDE; - virtual void appendIdentity() OVERRIDE; - virtual bool isIdentity() const OVERRIDE; + virtual bool canBlendWith(const WebKit::WebTransformOperations& other) const; + virtual void appendTranslate(double x, double y, double z); + virtual void appendRotate(double x, double y, double z, double degrees); + virtual void appendScale(double x, double y, double z); + virtual void appendSkew(double x, double y); + virtual void appendPerspective(double depth); + virtual void appendMatrix(const WebKit::WebTransformationMatrix&); + virtual void appendIdentity(); + virtual bool isIdentity() const; private: DISALLOW_COPY_AND_ASSIGN(WebTransformOperationsImpl); diff --git a/webkit/compositor_bindings/web_video_layer_impl.h b/webkit/compositor_bindings/web_video_layer_impl.h index 6974237..71c45e7 100644 --- a/webkit/compositor_bindings/web_video_layer_impl.h +++ b/webkit/compositor_bindings/web_video_layer_impl.h @@ -12,7 +12,9 @@ namespace webkit { class WebToCCVideoFrameProvider; } namespace WebKit { + class WebLayerImpl; +class WebVideoFrameProvider; class WebVideoLayerImpl : public WebVideoLayer { public: @@ -21,8 +23,8 @@ class WebVideoLayerImpl : public WebVideoLayer { virtual ~WebVideoLayerImpl(); // WebVideoLayer implementation. - virtual WebLayer* layer() OVERRIDE; - virtual bool active() const OVERRIDE; + virtual WebLayer* layer(); + virtual bool active() const; private: scoped_ptr provider_adapter_; -- cgit v1.1