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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/weblayertreeview_impl.h
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h
index 8310ad712972b691028e0c95195c86ad421dea40..c18182f7d54bcaa6408780929dd121ff198275fe 100644
--- a/mojo/services/html_viewer/weblayertreeview_impl.h
+++ b/mojo/services/html_viewer/weblayertreeview_impl.h
@@ -67,42 +67,40 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
void RateLimitSharedMainThreadContext() override {}
// blink::WebLayerTreeView implementation.
- virtual void setSurfaceReady() override;
- virtual void setRootLayer(const blink::WebLayer& layer) override;
- virtual void clearRootLayer() override;
- virtual void setViewportSize(
- const blink::WebSize& device_viewport_size) override;
- virtual blink::WebSize deviceViewportSize() const override;
- virtual void setDeviceScaleFactor(float) override;
- virtual float deviceScaleFactor() const override;
- virtual void setBackgroundColor(blink::WebColor color) override;
- virtual void setHasTransparentBackground(
- bool has_transparent_background) override;
- virtual void setOverhangBitmap(const SkBitmap& bitmap) override;
- virtual void setVisible(bool visible) override;
+ virtual void setSurfaceReady();
+ virtual void setRootLayer(const blink::WebLayer& layer);
+ virtual void clearRootLayer();
+ virtual void setViewportSize(const blink::WebSize& device_viewport_size);
+ virtual blink::WebSize deviceViewportSize() const;
+ virtual void setDeviceScaleFactor(float);
+ virtual float deviceScaleFactor() const;
+ virtual void setBackgroundColor(blink::WebColor color);
+ virtual void setHasTransparentBackground(bool has_transparent_background);
+ virtual void setOverhangBitmap(const SkBitmap& bitmap);
+ virtual void setVisible(bool visible);
virtual void setPageScaleFactorAndLimits(float page_scale_factor,
float minimum,
- float maximum) override;
+ float maximum);
virtual void startPageScaleAnimation(const blink::WebPoint& destination,
bool use_anchor,
float new_page_scale,
- double duration_sec) override;
+ double duration_sec);
virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {}
virtual void setTopControlsContentOffset(float offset) {}
- virtual void setNeedsAnimate() override;
- virtual bool commitRequested() const override;
+ virtual void setNeedsAnimate();
+ virtual bool commitRequested() const;
virtual void didStopFlinging() {}
virtual void compositeAndReadbackAsync(
blink::WebCompositeAndReadbackAsyncCallback* callback) {}
- virtual void finishAllRendering() override;
+ virtual void finishAllRendering();
virtual void setDeferCommits(bool defer_commits) {}
- virtual void registerForAnimations(blink::WebLayer* layer) override;
+ virtual void registerForAnimations(blink::WebLayer* layer);
virtual void registerViewportLayers(
const blink::WebLayer* overscrollElasticityLayer,
const blink::WebLayer* pageScaleLayerLayer,
const blink::WebLayer* innerViewportScrollLayer,
- const blink::WebLayer* outerViewportScrollLayer) override;
- virtual void clearViewportLayers() override;
+ const blink::WebLayer* outerViewportScrollLayer);
+ virtual void clearViewportLayers();
virtual void registerSelection(const blink::WebSelectionBound& start,
const blink::WebSelectionBound& end) {}
virtual void clearSelection() {}
« 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