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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 m_timeline->setDuration(duration); | 254 m_timeline->setDuration(duration); |
255 m_timeline->setPosition(mediaElement().currentTime()); | 255 m_timeline->setPosition(mediaElement().currentTime()); |
256 | 256 |
257 updateVolume(); | 257 updateVolume(); |
258 | 258 |
259 refreshClosedCaptionsButtonVisibility(); | 259 refreshClosedCaptionsButtonVisibility(); |
260 | 260 |
261 m_fullScreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement())); | 261 m_fullScreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement())); |
262 | 262 |
263 refreshCastButtonVisibilityWithoutUpdate(); | 263 refreshCastButtonVisibilityWithoutUpdate(); |
264 makeOpaque(); | |
265 | 264 |
266 // Set the panel width here, and force a layout, before the controls update. | 265 // Set the panel width here, and force a layout, before the controls update. |
267 // This would be harmless for the !useNewUi case too, but it causes | 266 // This would be harmless for the !useNewUi case too, but it causes |
268 // compositing/geometry/video-fixed-scrolling.html to fail with two extra | 267 // compositing/geometry/video-fixed-scrolling.html to fail with two extra |
269 // 0 height nodes in the render tree. | 268 // 0 height nodes in the render tree. |
270 if (useNewUi) | 269 if (useNewUi) |
271 m_panelWidth = m_panel->clientWidth(); | 270 m_panelWidth = m_panel->clientWidth(); |
272 } | 271 } |
273 | 272 |
274 LayoutObject* MediaControls::layoutObjectForTextTrackLayout() | 273 LayoutObject* MediaControls::layoutObjectForTextTrackLayout() |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 visitor->trace(m_toggleClosedCaptionsButton); | 736 visitor->trace(m_toggleClosedCaptionsButton); |
738 visitor->trace(m_fullScreenButton); | 737 visitor->trace(m_fullScreenButton); |
739 visitor->trace(m_durationDisplay); | 738 visitor->trace(m_durationDisplay); |
740 visitor->trace(m_enclosure); | 739 visitor->trace(m_enclosure); |
741 visitor->trace(m_castButton); | 740 visitor->trace(m_castButton); |
742 visitor->trace(m_overlayCastButton); | 741 visitor->trace(m_overlayCastButton); |
743 HTMLDivElement::trace(visitor); | 742 HTMLDivElement::trace(visitor); |
744 } | 743 } |
745 | 744 |
746 } | 745 } |
OLD | NEW |