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

Side by Side Diff: mojo/services/html_viewer/weblayertreeview_impl.h

Issue 1037363002: Remove unnecessary 'virtual' annotation from mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved merge conflicts Created 5 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 5 #ifndef MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
6 #define MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 6 #define MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 namespace html_viewer { 35 namespace html_viewer {
36 36
37 class WebLayerTreeViewImpl : public blink::WebLayerTreeView, 37 class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
38 public cc::LayerTreeHostClient, 38 public cc::LayerTreeHostClient,
39 public mojo::OutputSurfaceMojoClient { 39 public mojo::OutputSurfaceMojoClient {
40 public: 40 public:
41 WebLayerTreeViewImpl( 41 WebLayerTreeViewImpl(
42 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy, 42 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy,
43 mojo::SurfacePtr surface, 43 mojo::SurfacePtr surface,
44 mojo::GpuPtr gpu_service); 44 mojo::GpuPtr gpu_service);
45 virtual ~WebLayerTreeViewImpl(); 45 ~WebLayerTreeViewImpl() override;
46 46
47 void set_widget(blink::WebWidget* widget) { widget_ = widget; } 47 void set_widget(blink::WebWidget* widget) { widget_ = widget; }
48 void set_view(mojo::View* view) { view_ = view; } 48 void set_view(mojo::View* view) { view_ = view; }
49 49
50 // cc::LayerTreeHostClient implementation. 50 // cc::LayerTreeHostClient implementation.
51 void WillBeginMainFrame() override; 51 void WillBeginMainFrame() override;
52 void DidBeginMainFrame() override; 52 void DidBeginMainFrame() override;
53 void BeginMainFrame(const cc::BeginFrameArgs& args) override; 53 void BeginMainFrame(const cc::BeginFrameArgs& args) override;
54 void BeginMainFrameNotExpectedSoon() override; 54 void BeginMainFrameNotExpectedSoon() override;
55 void Layout() override; 55 void Layout() override;
56 void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta, 56 void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
57 const gfx::Vector2dF& outer_delta, 57 const gfx::Vector2dF& outer_delta,
58 const gfx::Vector2dF& elastic_overscroll_delta, 58 const gfx::Vector2dF& elastic_overscroll_delta,
59 float page_scale, 59 float page_scale,
60 float top_controls_delta) override; 60 float top_controls_delta) override;
61 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 61 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
62 float page_scale, 62 float page_scale,
63 float top_controls_delta) override; 63 float top_controls_delta) override;
64 void RequestNewOutputSurface() override; 64 void RequestNewOutputSurface() override;
65 void DidFailToInitializeOutputSurface() override; 65 void DidFailToInitializeOutputSurface() override;
66 void DidInitializeOutputSurface() override; 66 void DidInitializeOutputSurface() override;
67 void WillCommit() override; 67 void WillCommit() override;
68 void DidCommit() override; 68 void DidCommit() override;
69 void DidCommitAndDrawFrame() override; 69 void DidCommitAndDrawFrame() override;
70 void DidCompleteSwapBuffers() override; 70 void DidCompleteSwapBuffers() override;
71 void DidCompletePageScaleAnimation() override {} 71 void DidCompletePageScaleAnimation() override {}
72 void RateLimitSharedMainThreadContext() override {} 72 void RateLimitSharedMainThreadContext() override {}
73 73
74 // blink::WebLayerTreeView implementation. 74 // blink::WebLayerTreeView implementation.
75 virtual void setRootLayer(const blink::WebLayer& layer); 75 void setRootLayer(const blink::WebLayer& layer) override;
76 virtual void clearRootLayer(); 76 void clearRootLayer() override;
77 virtual void setViewportSize(const blink::WebSize& device_viewport_size); 77 void setViewportSize(const blink::WebSize& device_viewport_size) override;
78 virtual blink::WebSize deviceViewportSize() const; 78 blink::WebSize deviceViewportSize() const override;
79 virtual void setDeviceScaleFactor(float); 79 void setDeviceScaleFactor(float) override;
80 virtual float deviceScaleFactor() const; 80 float deviceScaleFactor() const override;
81 virtual void setBackgroundColor(blink::WebColor color); 81 void setBackgroundColor(blink::WebColor color) override;
82 virtual void setHasTransparentBackground(bool has_transparent_background); 82 void setHasTransparentBackground(bool has_transparent_background) override;
83 virtual void setVisible(bool visible); 83 void setVisible(bool visible) override;
84 virtual void setPageScaleFactorAndLimits(float page_scale_factor, 84 void setPageScaleFactorAndLimits(float page_scale_factor,
85 float minimum, 85 float minimum,
86 float maximum); 86 float maximum) override;
87 virtual void startPageScaleAnimation(const blink::WebPoint& destination, 87 void startPageScaleAnimation(const blink::WebPoint& destination,
88 bool use_anchor, 88 bool use_anchor,
89 float new_page_scale, 89 float new_page_scale,
90 double duration_sec); 90 double duration_sec) override;
91 virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {} 91 void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) override {}
92 virtual void setNeedsAnimate(); 92 void setNeedsAnimate() override;
93 virtual bool commitRequested() const; 93 bool commitRequested() const override;
94 virtual void didStopFlinging() {} 94 void didStopFlinging() override {}
95 virtual void compositeAndReadbackAsync( 95 void compositeAndReadbackAsync(
96 blink::WebCompositeAndReadbackAsyncCallback* callback) {} 96 blink::WebCompositeAndReadbackAsyncCallback* callback) override {}
97 virtual void finishAllRendering(); 97 void finishAllRendering() override;
98 virtual void setDeferCommits(bool defer_commits) {} 98 void setDeferCommits(bool defer_commits) override {}
99 virtual void registerForAnimations(blink::WebLayer* layer); 99 void registerForAnimations(blink::WebLayer* layer) override;
100 virtual void registerViewportLayers( 100 void registerViewportLayers(
101 const blink::WebLayer* overscrollElasticityLayer, 101 const blink::WebLayer* overscrollElasticityLayer,
102 const blink::WebLayer* pageScaleLayerLayer, 102 const blink::WebLayer* pageScaleLayerLayer,
103 const blink::WebLayer* innerViewportScrollLayer, 103 const blink::WebLayer* innerViewportScrollLayer,
104 const blink::WebLayer* outerViewportScrollLayer); 104 const blink::WebLayer* outerViewportScrollLayer) override;
105 virtual void clearViewportLayers(); 105 void clearViewportLayers() override;
106 virtual void registerSelection(const blink::WebSelectionBound& start, 106 void registerSelection(const blink::WebSelectionBound& start,
107 const blink::WebSelectionBound& end) {} 107 const blink::WebSelectionBound& end) override {}
108 virtual void clearSelection() {} 108 void clearSelection() override {}
109 virtual void setShowFPSCounter(bool) {} 109 void setShowFPSCounter(bool) override {}
110 virtual void setShowPaintRects(bool) {} 110 void setShowPaintRects(bool) override {}
111 virtual void setShowDebugBorders(bool) {} 111 void setShowDebugBorders(bool) override {}
112 virtual void setContinuousPaintingEnabled(bool) {} 112 void setContinuousPaintingEnabled(bool) override {}
113 virtual void setShowScrollBottleneckRects(bool) {} 113 void setShowScrollBottleneckRects(bool) override {}
114 114
115 // OutputSurfaceMojoClient implementation. 115 // OutputSurfaceMojoClient implementation.
116 void DidCreateSurface(cc::SurfaceId id) override; 116 void DidCreateSurface(cc::SurfaceId id) override;
117 117
118 private: 118 private:
119 void DidCreateSurfaceOnMainThread(cc::SurfaceId id); 119 void DidCreateSurfaceOnMainThread(cc::SurfaceId id);
120 120
121 // widget_ and view_ will outlive us. 121 // widget_ and view_ will outlive us.
122 blink::WebWidget* widget_; 122 blink::WebWidget* widget_;
123 mojo::View* view_; 123 mojo::View* view_;
124 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; 124 scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
125 scoped_ptr<cc::OutputSurface> output_surface_; 125 scoped_ptr<cc::OutputSurface> output_surface_;
126 scoped_refptr<base::SingleThreadTaskRunner> 126 scoped_refptr<base::SingleThreadTaskRunner>
127 main_thread_compositor_task_runner_; 127 main_thread_compositor_task_runner_;
128 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_; 128 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_;
129 129
130 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_; 130 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_;
131 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl); 131 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl);
132 }; 132 };
133 133
134 } // namespace html_viewer 134 } // namespace html_viewer
135 135
136 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 136 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/webcookiejar_impl.h ('k') | mojo/services/html_viewer/webmimeregistry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698