Source/core/rendering/RenderMedia.h - Issue 716733002: Merge 184652 "Disallow non-flexbox child renderers for RenderMedia"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderMedia.h

Issue 716733002: Merge 184652 "Disallow non-flexbox child renderers for RenderMedia" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderMedia.h

===================================================================

--- Source/core/rendering/RenderMedia.h (revision 185109)

+++ Source/core/rendering/RenderMedia.h (working copy)

@@ -63,6 +63,7 @@

// so we can't support generated content.

virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; }

virtual bool canHaveChildren() const OVERRIDE FINAL { return true; }

+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override final;

virtual const char* renderName() const OVERRIDE { return "RenderMedia"; }

virtual bool isMedia() const OVERRIDE FINAL { return true; }

« 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 »