| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 virtual void updateDisplayType() OVERRIDE; | 144 virtual void updateDisplayType() OVERRIDE; |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 // ---------------------------- | 147 // ---------------------------- |
| 148 | 148 |
| 149 class MediaControlVolumeSliderElement : public MediaControlInputElement { | 149 class MediaControlVolumeSliderElement : public MediaControlInputElement { |
| 150 public: | 150 public: |
| 151 virtual bool willRespondToMouseMoveEvents() OVERRIDE; | 151 virtual bool willRespondToMouseMoveEvents() OVERRIDE; |
| 152 virtual bool willRespondToMouseClickEvents() OVERRIDE; | 152 virtual bool willRespondToMouseClickEvents() OVERRIDE; |
| 153 void setVolume(double); | 153 void setVolume(double); |
| 154 void setClearMutedOnUserInteraction(bool); | |
| 155 | 154 |
| 156 protected: | 155 protected: |
| 157 explicit MediaControlVolumeSliderElement(Document&); | 156 explicit MediaControlVolumeSliderElement(Document&); |
| 158 | 157 |
| 159 virtual void defaultEventHandler(Event*) OVERRIDE; | 158 virtual void defaultEventHandler(Event*) OVERRIDE; |
| 160 | |
| 161 private: | |
| 162 bool m_clearMutedOnUserInteraction; | |
| 163 }; | 159 }; |
| 164 | 160 |
| 165 } // namespace WebCore | 161 } // namespace WebCore |
| 166 | 162 |
| 167 #endif // MediaControlElementTypes_h | 163 #endif // MediaControlElementTypes_h |
| OLD | NEW |