| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 setIsWanted(false); | 168 setIsWanted(false); |
| 169 | 169 |
| 170 stopTimer(); | 170 stopTimer(); |
| 171 } | 171 } |
| 172 | 172 |
| 173 void MediaControlPanelElement::didBecomeVisible() { | 173 void MediaControlPanelElement::didBecomeVisible() { |
| 174 DCHECK(m_isDisplayed && m_opaque); | 174 DCHECK(m_isDisplayed && m_opaque); |
| 175 mediaElement().mediaControlsDidBecomeVisible(); | 175 mediaElement().mediaControlsDidBecomeVisible(); |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool MediaControlPanelElement::isOpaque() const { |
| 179 return m_opaque; |
| 180 } |
| 181 |
| 178 void MediaControlPanelElement::makeOpaque() { | 182 void MediaControlPanelElement::makeOpaque() { |
| 179 if (m_opaque) | 183 if (m_opaque) |
| 180 return; | 184 return; |
| 181 | 185 |
| 182 setInlineStyleProperty(CSSPropertyOpacity, 1.0, | 186 setInlineStyleProperty(CSSPropertyOpacity, 1.0, |
| 183 CSSPrimitiveValue::UnitType::Number); | 187 CSSPrimitiveValue::UnitType::Number); |
| 184 m_opaque = true; | 188 m_opaque = true; |
| 185 | 189 |
| 186 if (m_isDisplayed) { | 190 if (m_isDisplayed) { |
| 187 setIsWanted(true); | 191 setIsWanted(true); |
| (...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 MediaControlCurrentTimeDisplayElement* | 1033 MediaControlCurrentTimeDisplayElement* |
| 1030 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) { | 1034 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) { |
| 1031 MediaControlCurrentTimeDisplayElement* element = | 1035 MediaControlCurrentTimeDisplayElement* element = |
| 1032 new MediaControlCurrentTimeDisplayElement(mediaControls); | 1036 new MediaControlCurrentTimeDisplayElement(mediaControls); |
| 1033 element->setShadowPseudoId( | 1037 element->setShadowPseudoId( |
| 1034 AtomicString("-webkit-media-controls-current-time-display")); | 1038 AtomicString("-webkit-media-controls-current-time-display")); |
| 1035 return element; | 1039 return element; |
| 1036 } | 1040 } |
| 1037 | 1041 |
| 1038 } // namespace blink | 1042 } // namespace blink |
| OLD | NEW |