third_party/WebKit/WebCore/rendering/RenderMedia.h - Issue 21165: Revert the merge. Mac build is mysteriously broken.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderMedia.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderMarquee.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2007, 2008 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 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 RefPtr<HTMLElement> m_panel;	102 RefPtr<HTMLElement> m_panel;

103 RefPtr<MediaControlMuteButtonElement> m_muteButton;	103 RefPtr<MediaControlMuteButtonElement> m_muteButton;

104 RefPtr<MediaControlPlayButtonElement> m_playButton;	104 RefPtr<MediaControlPlayButtonElement> m_playButton;

105 RefPtr<MediaControlSeekButtonElement> m_seekBackButton;	105 RefPtr<MediaControlSeekButtonElement> m_seekBackButton;

106 RefPtr<MediaControlSeekButtonElement> m_seekForwardButton;	106 RefPtr<MediaControlSeekButtonElement> m_seekForwardButton;

107 RefPtr<MediaControlTimelineElement> m_timeline;	107 RefPtr<MediaControlTimelineElement> m_timeline;

108 RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton;	108 RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton;

109 RefPtr<HTMLElement> m_timelineContainer;	109 RefPtr<HTMLElement> m_timelineContainer;

110 RefPtr<MediaTimeDisplayElement> m_currentTimeDisplay;	110 RefPtr<MediaTimeDisplayElement> m_currentTimeDisplay;

111 RefPtr<MediaTimeDisplayElement> m_timeRemainingDisplay;	111 RefPtr<MediaTimeDisplayElement> m_timeRemainingDisplay;

112 Node* m_lastUnderNode;	112 EventTargetNode* m_lastUnderNode;

113 Node* m_nodeUnderMouse;	113 EventTargetNode* m_nodeUnderMouse;

114	114

115 Timer<RenderMedia> m_timeUpdateTimer;	115 Timer<RenderMedia> m_timeUpdateTimer;

116 Timer<RenderMedia> m_opacityAnimationTimer;	116 Timer<RenderMedia> m_opacityAnimationTimer;

117 bool m_mouseOver;	117 bool m_mouseOver;

118 double m_opacityAnimationStartTime;	118 double m_opacityAnimationStartTime;

119 float m_opacityAnimationFrom;	119 float m_opacityAnimationFrom;

120 float m_opacityAnimationTo;	120 float m_opacityAnimationTo;

121 EVisibility m_previousVisible;	121 EVisibility m_previousVisible;

122 };	122 };

123	123

124 } // namespace WebCore	124 } // namespace WebCore

125	125

126 #endif	126 #endif

127 #endif // RenderMedia_h	127 #endif // RenderMedia_h

OLD	NEW