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

Unified Diff: Source/core/rendering/style/ContentData.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/BasicShapes.h ('k') | Source/core/rendering/style/StyleFetchedImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/ContentData.h
diff --git a/Source/core/rendering/style/ContentData.h b/Source/core/rendering/style/ContentData.h
index 531091fe06681c8cbbaec8fe1b6bbdfb7ffc913b..fe28e2e7685792925173662a8b6a48b63f0c4ebc 100644
--- a/Source/core/rendering/style/ContentData.h
+++ b/Source/core/rendering/style/ContentData.h
@@ -69,17 +69,17 @@ private:
#define DEFINE_CONTENT_DATA_TYPE_CASTS(typeName) \
DEFINE_TYPE_CASTS(typeName##ContentData, ContentData, content, content->is##typeName(), content.is##typeName())
-class ImageContentData FINAL : public ContentData {
+class ImageContentData final : public ContentData {
friend class ContentData;
public:
const StyleImage* image() const { return m_image.get(); }
StyleImage* image() { return m_image.get(); }
void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
- virtual bool isImage() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const OVERRIDE;
+ virtual bool isImage() const override { return true; }
+ virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
- virtual bool equals(const ContentData& data) const OVERRIDE
+ virtual bool equals(const ContentData& data) const override
{
if (!data.isImage())
return false;
@@ -92,7 +92,7 @@ private:
{
}
- virtual PassOwnPtr<ContentData> cloneInternal() const OVERRIDE
+ virtual PassOwnPtr<ContentData> cloneInternal() const override
{
RefPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
return create(image.release());
@@ -103,16 +103,16 @@ private:
DEFINE_CONTENT_DATA_TYPE_CASTS(Image);
-class TextContentData FINAL : public ContentData {
+class TextContentData final : public ContentData {
friend class ContentData;
public:
const String& text() const { return m_text; }
void setText(const String& text) { m_text = text; }
- virtual bool isText() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const OVERRIDE;
+ virtual bool isText() const override { return true; }
+ virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
- virtual bool equals(const ContentData& data) const OVERRIDE
+ virtual bool equals(const ContentData& data) const override
{
if (!data.isText())
return false;
@@ -125,21 +125,21 @@ private:
{
}
- virtual PassOwnPtr<ContentData> cloneInternal() const OVERRIDE { return create(text()); }
+ virtual PassOwnPtr<ContentData> cloneInternal() const override { return create(text()); }
String m_text;
};
DEFINE_CONTENT_DATA_TYPE_CASTS(Text);
-class CounterContentData FINAL : public ContentData {
+class CounterContentData final : public ContentData {
friend class ContentData;
public:
const CounterContent* counter() const { return m_counter.get(); }
void setCounter(PassOwnPtr<CounterContent> counter) { m_counter = counter; }
- virtual bool isCounter() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const OVERRIDE;
+ virtual bool isCounter() const override { return true; }
+ virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
private:
CounterContentData(PassOwnPtr<CounterContent> counter)
@@ -147,13 +147,13 @@ private:
{
}
- virtual PassOwnPtr<ContentData> cloneInternal() const OVERRIDE
+ virtual PassOwnPtr<ContentData> cloneInternal() const override
{
OwnPtr<CounterContent> counterData = adoptPtr(new CounterContent(*counter()));
return create(counterData.release());
}
- virtual bool equals(const ContentData& data) const OVERRIDE
+ virtual bool equals(const ContentData& data) const override
{
if (!data.isCounter())
return false;
@@ -165,16 +165,16 @@ private:
DEFINE_CONTENT_DATA_TYPE_CASTS(Counter);
-class QuoteContentData FINAL : public ContentData {
+class QuoteContentData final : public ContentData {
friend class ContentData;
public:
QuoteType quote() const { return m_quote; }
void setQuote(QuoteType quote) { m_quote = quote; }
- virtual bool isQuote() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const OVERRIDE;
+ virtual bool isQuote() const override { return true; }
+ virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
- virtual bool equals(const ContentData& data) const OVERRIDE
+ virtual bool equals(const ContentData& data) const override
{
if (!data.isQuote())
return false;
@@ -187,7 +187,7 @@ private:
{
}
- virtual PassOwnPtr<ContentData> cloneInternal() const OVERRIDE { return create(quote()); }
+ virtual PassOwnPtr<ContentData> cloneInternal() const override { return create(quote()); }
QuoteType m_quote;
};
« no previous file with comments | « Source/core/rendering/style/BasicShapes.h ('k') | Source/core/rendering/style/StyleFetchedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698