| OLD | NEW |
| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 MediaControlsPanel, | 56 MediaControlsPanel, |
| 57 MediaVolumeSliderContainer, | 57 MediaVolumeSliderContainer, |
| 58 MediaVolumeSlider, | 58 MediaVolumeSlider, |
| 59 MediaVolumeSliderThumb, | 59 MediaVolumeSliderThumb, |
| 60 MediaFullScreenVolumeSlider, | 60 MediaFullScreenVolumeSlider, |
| 61 MediaFullScreenVolumeSliderThumb, | 61 MediaFullScreenVolumeSliderThumb, |
| 62 MediaTextTrackDisplayContainer, | 62 MediaTextTrackDisplayContainer, |
| 63 MediaTextTrackDisplay, | 63 MediaTextTrackDisplay, |
| 64 MediaExitFullscreenButton, | 64 MediaExitFullscreenButton, |
| 65 MediaOverlayPlayButton, | 65 MediaOverlayPlayButton, |
| 66 MediaCastOffButton, |
| 67 MediaCastOnButton, |
| 68 MediaOverlayCastOffButton, |
| 69 MediaOverlayCastOnButton, |
| 66 }; | 70 }; |
| 67 | 71 |
| 68 HTMLMediaElement* toParentMediaElement(Node*); | 72 HTMLMediaElement* toParentMediaElement(Node*); |
| 69 inline HTMLMediaElement* toParentMediaElement(RenderObject* renderer) { return t
oParentMediaElement(renderer->node()); } | 73 inline HTMLMediaElement* toParentMediaElement(RenderObject* renderer) { return t
oParentMediaElement(renderer->node()); } |
| 70 | 74 |
| 71 MediaControlElementType mediaControlElementType(Node*); | 75 MediaControlElementType mediaControlElementType(Node*); |
| 72 | 76 |
| 73 // ---------------------------- | 77 // ---------------------------- |
| 74 | 78 |
| 75 class MediaControlElement : public WillBeGarbageCollectedMixin { | 79 class MediaControlElement : public WillBeGarbageCollectedMixin { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 protected: | 137 protected: |
| 134 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); | 138 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); |
| 135 | 139 |
| 136 private: | 140 private: |
| 137 double m_currentValue; | 141 double m_currentValue; |
| 138 }; | 142 }; |
| 139 | 143 |
| 140 } // namespace blink | 144 } // namespace blink |
| 141 | 145 |
| 142 #endif // MediaControlElementTypes_h | 146 #endif // MediaControlElementTypes_h |
| OLD | NEW |