| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 } | 129 } |
| 130 | 130 |
| 131 void MediaControlPanelElement::startTimer() | 131 void MediaControlPanelElement::startTimer() |
| 132 { | 132 { |
| 133 stopTimer(); | 133 stopTimer(); |
| 134 | 134 |
| 135 // The timer is required to set the property display:'none' on the panel, | 135 // The timer is required to set the property display:'none' on the panel, |
| 136 // such that captions are correctly displayed at the bottom of the video | 136 // such that captions are correctly displayed at the bottom of the video |
| 137 // at the end of the fadeout transition. | 137 // at the end of the fadeout transition. |
| 138 // FIXME: Racing a transition with a setTimeout like this is wrong. | 138 // FIXME: Racing a transition with a setTimeout like this is wrong. |
| 139 m_transitionTimer.startOneShot(fadeOutDuration); | 139 m_transitionTimer.startOneShot(fadeOutDuration, FROM_HERE); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void MediaControlPanelElement::stopTimer() | 142 void MediaControlPanelElement::stopTimer() |
| 143 { | 143 { |
| 144 if (m_transitionTimer.isActive()) | 144 if (m_transitionTimer.isActive()) |
| 145 m_transitionTimer.stop(); | 145 m_transitionTimer.stop(); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme
nt>*) | 148 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme
nt>*) |
| 149 { | 149 { |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 float fontSize = smallestDimension * 0.05f; | 737 float fontSize = smallestDimension * 0.05f; |
| 738 if (fontSize != m_fontSize) { | 738 if (fontSize != m_fontSize) { |
| 739 m_fontSize = fontSize; | 739 m_fontSize = fontSize; |
| 740 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); | 740 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); |
| 741 } | 741 } |
| 742 } | 742 } |
| 743 | 743 |
| 744 // ---------------------------- | 744 // ---------------------------- |
| 745 | 745 |
| 746 } // namespace WebCore | 746 } // namespace WebCore |
| OLD | NEW |