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

Unified Diff: Source/core/layout/LayoutEmbeddedObject.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutDetailsMarker.h ('k') | Source/core/layout/LayoutFieldset.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutEmbeddedObject.h
diff --git a/Source/core/layout/LayoutEmbeddedObject.h b/Source/core/layout/LayoutEmbeddedObject.h
index d6f7a62afcfd0ed29901c0ac33de5a88c1dca419..89713530965a8f305ba16a34428aa7dd112295a0 100644
--- a/Source/core/layout/LayoutEmbeddedObject.h
+++ b/Source/core/layout/LayoutEmbeddedObject.h
@@ -34,7 +34,7 @@ class TextRun;
class LayoutEmbeddedObject : public LayoutPart {
public:
LayoutEmbeddedObject(Element*);
- virtual ~LayoutEmbeddedObject();
+ ~LayoutEmbeddedObject() override;
enum PluginUnavailabilityReason {
PluginMissing,
@@ -43,26 +43,26 @@ public:
void setPluginUnavailabilityReason(PluginUnavailabilityReason);
bool showsUnavailablePluginIndicator() const;
- virtual const char* name() const override { return "LayoutEmbeddedObject"; }
+ const char* name() const override { return "LayoutEmbeddedObject"; }
const String& unavailablePluginReplacementText() const { return m_unavailablePluginReplacementText; }
private:
- virtual void paintContents(const PaintInfo&, const LayoutPoint&) override final;
- virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) override final;
- virtual void paint(const PaintInfo&, const LayoutPoint&) override final;
+ void paintContents(const PaintInfo&, const LayoutPoint&) final;
+ void paintReplaced(const PaintInfo&, const LayoutPoint&) final;
+ void paint(const PaintInfo&, const LayoutPoint&) final;
- virtual void layout() override final;
- virtual PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, const LayoutBoxModelObject&) override final;
+ void layout() final;
+ PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, const LayoutBoxModelObject&) final;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectEmbeddedObject || LayoutPart::isOfType(type); }
- virtual LayoutBox* embeddedContentBox() const override final;
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectEmbeddedObject || LayoutPart::isOfType(type); }
+ LayoutBox* embeddedContentBox() const final;
- virtual DeprecatedPaintLayerType layerTypeRequired() const override final;
+ DeprecatedPaintLayerType layerTypeRequired() const final;
- virtual ScrollResultOneDimensional scroll(ScrollDirectionPhysical, ScrollGranularity, float multiplier) override final;
+ ScrollResultOneDimensional scroll(ScrollDirectionPhysical, ScrollGranularity, float multiplier) final;
- virtual CompositingReasons additionalCompositingReasons() const override;
+ CompositingReasons additionalCompositingReasons() const override;
bool m_showsUnavailablePluginIndicator;
PluginUnavailabilityReason m_pluginUnavailabilityReason;
« no previous file with comments | « Source/core/layout/LayoutDetailsMarker.h ('k') | Source/core/layout/LayoutFieldset.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698