| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 bool m_isPausedForScrubbing : 1; | 150 bool m_isPausedForScrubbing : 1; |
| 151 | 151 |
| 152 Timer<MediaControls> m_panelWidthChangedTimer; | 152 Timer<MediaControls> m_panelWidthChangedTimer; |
| 153 int m_panelWidth; | 153 int m_panelWidth; |
| 154 | 154 |
| 155 bool m_allowHiddenVolumeControls : 1; | 155 bool m_allowHiddenVolumeControls : 1; |
| 156 }; | 156 }; |
| 157 | 157 |
| 158 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); | 158 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); |
| 159 | 159 |
| 160 } | 160 } // namespace blink |
| 161 | 161 |
| 162 #endif | 162 #endif |
| OLD | NEW |