Source/WebCore/html/shadow/MediaControlElements.cpp - Issue 7497054: Merge 92347

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/WebCore/html/shadow/MediaControlElements.cpp

Issue 7497054: Merge 92347 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 4 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:

Index: Source/WebCore/html/shadow/MediaControlElements.cpp

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

--- Source/WebCore/html/shadow/MediaControlElements.cpp (revision 92737)

+++ Source/WebCore/html/shadow/MediaControlElements.cpp (working copy)

@@ -57,7 +57,7 @@

HTMLMediaElement* toParentMediaElement(Node* node)

{

Node* mediaNode = node ? node->shadowAncestorNode() : 0;

- if (!mediaNode || (!mediaNode->hasTagName(HTMLNames::videoTag) && !mediaNode->hasTagName(HTMLNames::audioTag)))

+ if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())

return 0;

return static_cast<HTMLMediaElement*>(mediaNode);

« no previous file with comments | « Source/WebCore/html/HTMLTrackElement.cpp ('k') | Source/WebCore/page/FrameView.cpp » ('j') | no next file with comments »