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

Side by Side Diff: Source/core/html/shadow/MediaControlElementTypes.h

Issue 988763002: Start separating the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControlElements.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 MediaPauseButton, 51 MediaPauseButton,
52 MediaTimelineContainer, 52 MediaTimelineContainer,
53 MediaCurrentTimeDisplay, 53 MediaCurrentTimeDisplay,
54 MediaTimeRemainingDisplay, 54 MediaTimeRemainingDisplay,
55 MediaControlsPanel, 55 MediaControlsPanel,
56 MediaVolumeSliderContainer, 56 MediaVolumeSliderContainer,
57 MediaVolumeSlider, 57 MediaVolumeSlider,
58 MediaVolumeSliderThumb, 58 MediaVolumeSliderThumb,
59 MediaFullScreenVolumeSlider, 59 MediaFullScreenVolumeSlider,
60 MediaFullScreenVolumeSliderThumb, 60 MediaFullScreenVolumeSliderThumb,
61 MediaTextTrackDisplayContainer,
62 MediaExitFullscreenButton, 61 MediaExitFullscreenButton,
63 MediaOverlayPlayButton, 62 MediaOverlayPlayButton,
64 MediaCastOffButton, 63 MediaCastOffButton,
65 MediaCastOnButton, 64 MediaCastOnButton,
66 MediaOverlayCastOffButton, 65 MediaOverlayCastOffButton,
67 MediaOverlayCastOnButton, 66 MediaOverlayCastOnButton,
68 }; 67 };
69 68
70 HTMLMediaElement* toParentMediaElement(Node*); 69 HTMLMediaElement* toParentMediaElement(Node*);
71 inline HTMLMediaElement* toParentMediaElement(LayoutObject* renderer) { return t oParentMediaElement(renderer->node()); } 70 inline HTMLMediaElement* toParentMediaElement(LayoutObject* renderer) { return t oParentMediaElement(renderer->node()); }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 protected: 136 protected:
138 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); 137 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType);
139 138
140 private: 139 private:
141 double m_currentValue; 140 double m_currentValue;
142 }; 141 };
143 142
144 } // namespace blink 143 } // namespace blink
145 144
146 #endif // MediaControlElementTypes_h 145 #endif // MediaControlElementTypes_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControlElements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698