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

Side by Side Diff: Source/core/rendering/RenderMedia.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "core/rendering/RenderImage.h" 29 #include "core/rendering/RenderImage.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class HTMLMediaElement; 33 class HTMLMediaElement;
34 34
35 class RenderMedia : public RenderImage { 35 class RenderMedia : public RenderImage {
36 public: 36 public:
37 explicit RenderMedia(HTMLMediaElement*); 37 explicit RenderMedia(HTMLMediaElement*);
38 virtual ~RenderMedia(); 38 virtual ~RenderMedia();
39 virtual void trace(Visitor*) OVERRIDE; 39 virtual void trace(Visitor*) override;
40 40
41 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 41 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
42 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); } 42 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); }
43 43
44 // If you have a RenderMedia, use firstChild or lastChild instead. 44 // If you have a RenderMedia, use firstChild or lastChild instead.
45 void slowFirstChild() const WTF_DELETED_FUNCTION; 45 void slowFirstChild() const WTF_DELETED_FUNCTION;
46 void slowLastChild() const WTF_DELETED_FUNCTION; 46 void slowLastChild() const WTF_DELETED_FUNCTION;
47 47
48 const RenderObjectChildList* children() const { return &m_children; } 48 const RenderObjectChildList* children() const { return &m_children; }
49 RenderObjectChildList* children() { return &m_children; } 49 RenderObjectChildList* children() { return &m_children; }
50 50
51 HTMLMediaElement* mediaElement() const; 51 HTMLMediaElement* mediaElement() const;
52 52
53 protected: 53 protected:
54 virtual void layout() OVERRIDE; 54 virtual void layout() override;
55 55
56 private: 56 private:
57 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); } 57 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); }
58 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 58 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
59 59
60 virtual LayerType layerTypeRequired() const OVERRIDE { return NormalLayer; } 60 virtual LayerType layerTypeRequired() const override { return NormalLayer; }
61 61
62 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed 62 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed
63 // so we can't support generated content. 63 // so we can't support generated content.
64 virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; } 64 virtual bool canHaveGeneratedChildren() const override final { return false; }
65 virtual bool canHaveChildren() const OVERRIDE FINAL { return true; } 65 virtual bool canHaveChildren() const override final { return true; }
66 66
67 virtual const char* renderName() const OVERRIDE { return "RenderMedia"; } 67 virtual const char* renderName() const override { return "RenderMedia"; }
68 virtual bool isMedia() const OVERRIDE FINAL { return true; } 68 virtual bool isMedia() const override final { return true; }
69 virtual bool isImage() const OVERRIDE FINAL { return false; } 69 virtual bool isImage() const override final { return false; }
70 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE; 70 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
71 71
72 RenderObjectChildList m_children; 72 RenderObjectChildList m_children;
73 }; 73 };
74 74
75 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia()); 75 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia());
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // RenderMedia_h 79 #endif // RenderMedia_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMediaControlElements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698