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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 805893003: mojo: Don't put override on methods overriding blink interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | 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 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void RequestNewOutputSurface() override; 60 void RequestNewOutputSurface() override;
61 void DidFailToInitializeOutputSurface() override; 61 void DidFailToInitializeOutputSurface() override;
62 void DidInitializeOutputSurface() override; 62 void DidInitializeOutputSurface() override;
63 void WillCommit() override; 63 void WillCommit() override;
64 void DidCommit() override; 64 void DidCommit() override;
65 void DidCommitAndDrawFrame() override; 65 void DidCommitAndDrawFrame() override;
66 void DidCompleteSwapBuffers() override; 66 void DidCompleteSwapBuffers() override;
67 void RateLimitSharedMainThreadContext() override {} 67 void RateLimitSharedMainThreadContext() override {}
68 68
69 // blink::WebLayerTreeView implementation. 69 // blink::WebLayerTreeView implementation.
70 virtual void setSurfaceReady() override; 70 virtual void setSurfaceReady();
71 virtual void setRootLayer(const blink::WebLayer& layer) override; 71 virtual void setRootLayer(const blink::WebLayer& layer);
72 virtual void clearRootLayer() override; 72 virtual void clearRootLayer();
73 virtual void setViewportSize( 73 virtual void setViewportSize(const blink::WebSize& device_viewport_size);
74 const blink::WebSize& device_viewport_size) override; 74 virtual blink::WebSize deviceViewportSize() const;
75 virtual blink::WebSize deviceViewportSize() const override; 75 virtual void setDeviceScaleFactor(float);
76 virtual void setDeviceScaleFactor(float) override; 76 virtual float deviceScaleFactor() const;
77 virtual float deviceScaleFactor() const override; 77 virtual void setBackgroundColor(blink::WebColor color);
78 virtual void setBackgroundColor(blink::WebColor color) override; 78 virtual void setHasTransparentBackground(bool has_transparent_background);
79 virtual void setHasTransparentBackground( 79 virtual void setOverhangBitmap(const SkBitmap& bitmap);
80 bool has_transparent_background) override; 80 virtual void setVisible(bool visible);
81 virtual void setOverhangBitmap(const SkBitmap& bitmap) override;
82 virtual void setVisible(bool visible) override;
83 virtual void setPageScaleFactorAndLimits(float page_scale_factor, 81 virtual void setPageScaleFactorAndLimits(float page_scale_factor,
84 float minimum, 82 float minimum,
85 float maximum) override; 83 float maximum);
86 virtual void startPageScaleAnimation(const blink::WebPoint& destination, 84 virtual void startPageScaleAnimation(const blink::WebPoint& destination,
87 bool use_anchor, 85 bool use_anchor,
88 float new_page_scale, 86 float new_page_scale,
89 double duration_sec) override; 87 double duration_sec);
90 virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {} 88 virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {}
91 virtual void setTopControlsContentOffset(float offset) {} 89 virtual void setTopControlsContentOffset(float offset) {}
92 virtual void setNeedsAnimate() override; 90 virtual void setNeedsAnimate();
93 virtual bool commitRequested() const override; 91 virtual bool commitRequested() const;
94 virtual void didStopFlinging() {} 92 virtual void didStopFlinging() {}
95 virtual void compositeAndReadbackAsync( 93 virtual void compositeAndReadbackAsync(
96 blink::WebCompositeAndReadbackAsyncCallback* callback) {} 94 blink::WebCompositeAndReadbackAsyncCallback* callback) {}
97 virtual void finishAllRendering() override; 95 virtual void finishAllRendering();
98 virtual void setDeferCommits(bool defer_commits) {} 96 virtual void setDeferCommits(bool defer_commits) {}
99 virtual void registerForAnimations(blink::WebLayer* layer) override; 97 virtual void registerForAnimations(blink::WebLayer* layer);
100 virtual void registerViewportLayers( 98 virtual void registerViewportLayers(
101 const blink::WebLayer* overscrollElasticityLayer, 99 const blink::WebLayer* overscrollElasticityLayer,
102 const blink::WebLayer* pageScaleLayerLayer, 100 const blink::WebLayer* pageScaleLayerLayer,
103 const blink::WebLayer* innerViewportScrollLayer, 101 const blink::WebLayer* innerViewportScrollLayer,
104 const blink::WebLayer* outerViewportScrollLayer) override; 102 const blink::WebLayer* outerViewportScrollLayer);
105 virtual void clearViewportLayers() override; 103 virtual void clearViewportLayers();
106 virtual void registerSelection(const blink::WebSelectionBound& start, 104 virtual void registerSelection(const blink::WebSelectionBound& start,
107 const blink::WebSelectionBound& end) {} 105 const blink::WebSelectionBound& end) {}
108 virtual void clearSelection() {} 106 virtual void clearSelection() {}
109 virtual void setShowFPSCounter(bool) {} 107 virtual void setShowFPSCounter(bool) {}
110 virtual void setShowPaintRects(bool) {} 108 virtual void setShowPaintRects(bool) {}
111 virtual void setShowDebugBorders(bool) {} 109 virtual void setShowDebugBorders(bool) {}
112 virtual void setContinuousPaintingEnabled(bool) {} 110 virtual void setContinuousPaintingEnabled(bool) {}
113 virtual void setShowScrollBottleneckRects(bool) {} 111 virtual void setShowScrollBottleneckRects(bool) {}
114 112
115 // OutputSurfaceMojoClient implementation. 113 // OutputSurfaceMojoClient implementation.
(...skipping 14 matching lines...) Expand all
130 main_thread_compositor_task_runner_; 128 main_thread_compositor_task_runner_;
131 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_; 129 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_;
132 130
133 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_; 131 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_;
134 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl); 132 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl);
135 }; 133 };
136 134
137 } // namespace mojo 135 } // namespace mojo
138 136
139 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 137 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698