Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Side by Side Diff: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 12250021: Remove OVERRIDE annotations from implementations of WebKit APIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WebLayerTreeViewImpl_h 5 #ifndef WebLayerTreeViewImpl_h
6 #define WebLayerTreeViewImpl_h 6 #define WebLayerTreeViewImpl_h
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/layer_tree_host_client.h" 9 #include "cc/layer_tree_host_client.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
(...skipping 15 matching lines...) Expand all
26 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerTreeViewImpl( 26 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerTreeViewImpl(
27 WebLayerTreeViewClient*); 27 WebLayerTreeViewClient*);
28 virtual ~WebLayerTreeViewImpl(); 28 virtual ~WebLayerTreeViewImpl();
29 29
30 WEBKIT_COMPOSITOR_BINDINGS_EXPORT bool initialize( 30 WEBKIT_COMPOSITOR_BINDINGS_EXPORT bool initialize(
31 const Settings&, scoped_ptr<cc::Thread> implThread); 31 const Settings&, scoped_ptr<cc::Thread> implThread);
32 32
33 WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const ; 33 WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const ;
34 34
35 // WebLayerTreeView implementation. 35 // WebLayerTreeView implementation.
36 virtual void setSurfaceReady() OVERRIDE; 36 virtual void setSurfaceReady();
37 virtual void setRootLayer(const WebLayer&) OVERRIDE; 37 virtual void setRootLayer(const WebLayer&);
38 virtual void clearRootLayer() OVERRIDE; 38 virtual void clearRootLayer();
39 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize) OVERRIDE; 39 virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSiz e& deviceViewportSize);
40 virtual WebSize layoutViewportSize() const OVERRIDE; 40 virtual WebSize layoutViewportSize() const;
41 virtual WebSize deviceViewportSize() const OVERRIDE; 41 virtual WebSize deviceViewportSize() const;
42 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const; // FIXME: remove this after WebKit roll. 42 virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& poin t) const; // FIXME: remove this after WebKit roll.
43 virtual void setDeviceScaleFactor(float) OVERRIDE; 43 virtual void setDeviceScaleFactor(float);
44 virtual float deviceScaleFactor() const OVERRIDE; 44 virtual float deviceScaleFactor() const;
45 virtual void setBackgroundColor(WebColor) OVERRIDE; 45 virtual void setBackgroundColor(WebColor);
46 virtual void setHasTransparentBackground(bool) OVERRIDE; 46 virtual void setHasTransparentBackground(bool);
47 virtual void setVisible(bool) OVERRIDE; 47 virtual void setVisible(bool);
48 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum) OVERRIDE; 48 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum);
49 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE; 49 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec);
50 virtual void setNeedsAnimate() OVERRIDE; 50 virtual void setNeedsAnimate();
51 virtual void setNeedsRedraw() OVERRIDE; 51 virtual void setNeedsRedraw();
52 virtual bool commitRequested() const OVERRIDE; 52 virtual bool commitRequested() const;
53 virtual void composite() OVERRIDE; 53 virtual void composite();
54 virtual void updateAnimations(double frameBeginTime) OVERRIDE; 54 virtual void updateAnimations(double frameBeginTime);
55 virtual void didStopFlinging() OVERRIDE; 55 virtual void didStopFlinging();
56 virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE; 56 virtual bool compositeAndReadback(void *pixels, const WebRect&);
57 virtual void finishAllRendering() OVERRIDE; 57 virtual void finishAllRendering();
58 virtual void setDeferCommits(bool deferCommits) OVERRIDE; 58 virtual void setDeferCommits(bool deferCommits);
59 virtual void renderingStats(WebRenderingStats&) const OVERRIDE; 59 virtual void renderingStats(WebRenderingStats&) const;
60 virtual void setShowFPSCounter(bool show); 60 virtual void setShowFPSCounter(bool show);
61 virtual void setShowPaintRects(bool show); 61 virtual void setShowPaintRects(bool show);
62 virtual void setShowDebugBorders(bool show); 62 virtual void setShowDebugBorders(bool show);
63 virtual void setContinuousPaintingEnabled(bool); 63 virtual void setContinuousPaintingEnabled(bool);
64 64
65 // cc::LayerTreeHostClient implementation. 65 // cc::LayerTreeHostClient implementation.
66 virtual void willBeginFrame() OVERRIDE; 66 virtual void willBeginFrame() OVERRIDE;
67 virtual void didBeginFrame() OVERRIDE; 67 virtual void didBeginFrame() OVERRIDE;
68 virtual void animate(double monotonicFrameBeginTime) OVERRIDE; 68 virtual void animate(double monotonicFrameBeginTime) OVERRIDE;
69 virtual void layout() OVERRIDE; 69 virtual void layout() OVERRIDE;
70 virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) OVERRIDE; 70 virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) OVERRIDE;
71 virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE; 71 virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE;
72 virtual void didRecreateOutputSurface(bool success) OVERRIDE; 72 virtual void didRecreateOutputSurface(bool success) OVERRIDE;
73 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; 73 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
74 virtual void willCommit() OVERRIDE; 74 virtual void willCommit() OVERRIDE;
75 virtual void didCommit() OVERRIDE; 75 virtual void didCommit() OVERRIDE;
76 virtual void didCommitAndDrawFrame() OVERRIDE; 76 virtual void didCommitAndDrawFrame() OVERRIDE;
77 virtual void didCompleteSwapBuffers() OVERRIDE; 77 virtual void didCompleteSwapBuffers() OVERRIDE;
78 virtual void scheduleComposite() OVERRIDE; 78 virtual void scheduleComposite() OVERRIDE;
79 virtual scoped_ptr<cc::FontAtlas> createFontAtlas(); 79 virtual scoped_ptr<cc::FontAtlas> createFontAtlas();
80 80
81 private: 81 private:
82 WebLayerTreeViewClient* m_client; 82 WebLayerTreeViewClient* m_client;
83 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost; 83 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;
84 }; 84 };
85 85
86 } // namespace WebKit 86 } // namespace WebKit
87 87
88 #endif // WebLayerTreeViewImpl_h 88 #endif // WebLayerTreeViewImpl_h
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698