Source/WebCore/html/HTMLMediaElement.h - Issue 9910031: Merge 111895

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/HTMLMediaElement.h

Issue 9910031: Merge 111895 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 9 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/HTMLMediaElement.h

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

--- Source/WebCore/html/HTMLMediaElement.h (revision 112578)

+++ Source/WebCore/html/HTMLMediaElement.h (working copy)

@@ -502,9 +502,8 @@

// Loading state.

enum LoadState { WaitingForSource, LoadingFromSrcAttr, LoadingFromSourceElement };

LoadState m_loadState;

- HTMLSourceElement* m_currentSourceNode;

- Node* m_nextChildNodeToConsider;

- Node* sourceChildEndOfListValue() { return static_cast<Node*>(this); }

+ RefPtr<HTMLSourceElement> m_currentSourceNode;

+ RefPtr<Node> m_nextChildNodeToConsider;

OwnPtr<MediaPlayer> m_player;

#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)