| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 // ---------------------------- | 73 // ---------------------------- |
| 74 | 74 |
| 75 class MediaControlElement : public WillBeGarbageCollectedMixin { | 75 class MediaControlElement : public WillBeGarbageCollectedMixin { |
| 76 public: | 76 public: |
| 77 void hide(); | 77 void hide(); |
| 78 void show(); | 78 void show(); |
| 79 | 79 |
| 80 MediaControlElementType displayType() { return m_displayType; } | 80 MediaControlElementType displayType() { return m_displayType; } |
| 81 | 81 |
| 82 virtual void trace(Visitor*); | 82 virtual void trace(Visitor*); |
| 83 // FIXME: Remove this later |
| 84 void setDisplayType(MediaControlElementType); |
| 83 | 85 |
| 84 protected: | 86 protected: |
| 85 MediaControlElement(MediaControls&, MediaControlElementType, HTMLElement*); | 87 MediaControlElement(MediaControls&, MediaControlElementType, HTMLElement*); |
| 86 | 88 |
| 87 MediaControls& mediaControls() const { return m_mediaControls; } | 89 MediaControls& mediaControls() const { return m_mediaControls; } |
| 88 HTMLMediaElement& mediaElement() const; | 90 HTMLMediaElement& mediaElement() const; |
| 89 | 91 |
| 90 void setDisplayType(MediaControlElementType); | |
| 91 | |
| 92 private: | 92 private: |
| 93 MediaControls& m_mediaControls; | 93 MediaControls& m_mediaControls; |
| 94 MediaControlElementType m_displayType; | 94 MediaControlElementType m_displayType; |
| 95 RawPtrWillBeMember<HTMLElement> m_element; | 95 RawPtrWillBeMember<HTMLElement> m_element; |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 // ---------------------------- | 98 // ---------------------------- |
| 99 | 99 |
| 100 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement
{ | 100 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement
{ |
| 101 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement); | 101 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 protected: | 133 protected: |
| 134 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); | 134 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); |
| 135 | 135 |
| 136 private: | 136 private: |
| 137 double m_currentValue; | 137 double m_currentValue; |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 } // namespace blink | 140 } // namespace blink |
| 141 | 141 |
| 142 #endif // MediaControlElementTypes_h | 142 #endif // MediaControlElementTypes_h |
| OLD | NEW |