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

Side by Side Diff: Source/core/rendering/RenderEmbeddedObject.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderDetailsMarker.h ('k') | Source/core/rendering/RenderFieldset.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 26 matching lines...) Expand all
37 virtual ~RenderEmbeddedObject(); 37 virtual ~RenderEmbeddedObject();
38 38
39 enum PluginUnavailabilityReason { 39 enum PluginUnavailabilityReason {
40 PluginMissing, 40 PluginMissing,
41 PluginBlockedByContentSecurityPolicy, 41 PluginBlockedByContentSecurityPolicy,
42 }; 42 };
43 void setPluginUnavailabilityReason(PluginUnavailabilityReason); 43 void setPluginUnavailabilityReason(PluginUnavailabilityReason);
44 bool showsUnavailablePluginIndicator() const; 44 bool showsUnavailablePluginIndicator() const;
45 45
46 private: 46 private:
47 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 47 virtual void paintContents(PaintInfo&, const LayoutPoint&) override final;
48 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 48 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override final;
49 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 49 virtual void paint(PaintInfo&, const LayoutPoint&) override final;
50 50
51 virtual void layout() OVERRIDE FINAL; 51 virtual void layout() override final;
52 52
53 virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObje ct"; } 53 virtual const char* renderName() const override { return "RenderEmbeddedObje ct"; }
54 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; } 54 virtual bool isEmbeddedObject() const override final { return true; }
55 virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL; 55 virtual RenderBox* embeddedContentBox() const override final;
56 56
57 virtual LayerType layerTypeRequired() const OVERRIDE FINAL; 57 virtual LayerType layerTypeRequired() const override final;
58 58
59 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE FINAL; 59 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) ov erride final;
60 60
61 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const; 61 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
62 62
63 virtual CompositingReasons additionalCompositingReasons() const OVERRIDE; 63 virtual CompositingReasons additionalCompositingReasons() const override;
64 64
65 bool m_showsUnavailablePluginIndicator; 65 bool m_showsUnavailablePluginIndicator;
66 PluginUnavailabilityReason m_pluginUnavailabilityReason; 66 PluginUnavailabilityReason m_pluginUnavailabilityReason;
67 String m_unavailablePluginReplacementText; 67 String m_unavailablePluginReplacementText;
68 }; 68 };
69 69
70 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject()); 70 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject());
71 71
72 } // namespace blink 72 } // namespace blink
73 73
74 #endif // RenderEmbeddedObject_h 74 #endif // RenderEmbeddedObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderDetailsMarker.h ('k') | Source/core/rendering/RenderFieldset.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698