| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2011, 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 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 Member<MediaControlsWindowEventListener> m_windowEventListener; | 174 Member<MediaControlsWindowEventListener> m_windowEventListener; |
| 175 | 175 |
| 176 Timer<MediaControls> m_hideMediaControlsTimer; | 176 Timer<MediaControls> m_hideMediaControlsTimer; |
| 177 unsigned m_hideTimerBehaviorFlags; | 177 unsigned m_hideTimerBehaviorFlags; |
| 178 bool m_isMouseOverControls : 1; | 178 bool m_isMouseOverControls : 1; |
| 179 bool m_isPausedForScrubbing : 1; | 179 bool m_isPausedForScrubbing : 1; |
| 180 | 180 |
| 181 Timer<MediaControls> m_panelWidthChangedTimer; | 181 Timer<MediaControls> m_panelWidthChangedTimer; |
| 182 int m_panelWidth; | 182 int m_panelWidth; |
| 183 | 183 |
| 184 bool m_allowHiddenVolumeControls : 1; | |
| 185 bool m_keepShowingUntilTimerFires : 1; | 184 bool m_keepShowingUntilTimerFires : 1; |
| 186 }; | 185 }; |
| 187 | 186 |
| 188 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); | 187 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); |
| 189 | 188 |
| 190 } // namespace blink | 189 } // namespace blink |
| 191 | 190 |
| 192 #endif | 191 #endif |
| OLD | NEW |