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

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

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 private: 51 private:
52 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); } 52 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); }
53 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 53 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
54 54
55 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed 55 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed
56 // so we can't support generated content. 56 // so we can't support generated content.
57 virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; } 57 virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; }
58 virtual bool canHaveChildren() const OVERRIDE FINAL { return true; } 58 virtual bool canHaveChildren() const OVERRIDE FINAL { return true; }
59 59
60 virtual const char* renderName() const { return "RenderMedia"; } 60 virtual const char* renderName() const OVERRIDE { return "RenderMedia"; }
61 virtual bool isMedia() const OVERRIDE FINAL { return true; } 61 virtual bool isMedia() const OVERRIDE FINAL { return true; }
62 virtual bool isImage() const OVERRIDE FINAL { return false; } 62 virtual bool isImage() const OVERRIDE FINAL { return false; }
63 virtual void paintReplaced(PaintInfo&, const LayoutPoint&); 63 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE;
64 64
65 RenderObjectChildList m_children; 65 RenderObjectChildList m_children;
66 }; 66 };
67 67
68 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia()); 68 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia());
69 69
70 } // namespace WebCore 70 } // namespace WebCore
71 71
72 #endif // RenderMedia_h 72 #endif // RenderMedia_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMarquee.h ('k') | Source/core/rendering/RenderMediaControlElements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698