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

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

Issue 689613002: Disallow non-flexbox child renderers for RenderMedia (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: z-index Created 6 years, 1 month 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 | Annotate | Revision Log
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 private: 58 private:
59 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); } 59 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); }
60 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); } 60 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
61 61
62 virtual LayerType layerTypeRequired() const override { return NormalLayer; } 62 virtual LayerType layerTypeRequired() const override { return NormalLayer; }
63 63
64 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed 64 // FIXME: RenderMedia::layout makes assumptions about what children are allo wed
65 // so we can't support generated content. 65 // so we can't support generated content.
66 virtual bool canHaveGeneratedChildren() const override final { return false; } 66 virtual bool canHaveGeneratedChildren() const override final { return false; }
67 virtual bool canHaveChildren() const override final { return true; } 67 virtual bool canHaveChildren() const override final { return true; }
68 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override fina l;
68 69
69 virtual const char* renderName() const override { return "RenderMedia"; } 70 virtual const char* renderName() const override { return "RenderMedia"; }
70 virtual bool isImage() const override final { return false; } 71 virtual bool isImage() const override final { return false; }
71 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override; 72 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
72 73
73 RenderObjectChildList m_children; 74 RenderObjectChildList m_children;
74 }; 75 };
75 76
76 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia()); 77 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMedia, isMedia());
77 78
78 } // namespace blink 79 } // namespace blink
79 80
80 #endif // RenderMedia_h 81 #endif // RenderMedia_h
OLDNEW
« no previous file with comments | « LayoutTests/media/webkit-media-controls-webkit-appearance-expected.html ('k') | Source/core/rendering/RenderMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698