| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 { | 118 { |
| 119 if (!m_isBeingDragged) | 119 if (!m_isBeingDragged) |
| 120 return; | 120 return; |
| 121 | 121 |
| 122 m_isBeingDragged = false; | 122 m_isBeingDragged = false; |
| 123 | 123 |
| 124 Frame* frame = document().frame(); | 124 Frame* frame = document().frame(); |
| 125 if (!frame) | 125 if (!frame) |
| 126 return; | 126 return; |
| 127 | 127 |
| 128 frame->eventHandler().setCapturingMouseEventsNode(0); | 128 frame->eventHandler().setCapturingMouseEventsNode(nullptr); |
| 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. |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 float fontSize = smallestDimension * 0.05f; | 746 float fontSize = smallestDimension * 0.05f; |
| 747 if (fontSize != m_fontSize) { | 747 if (fontSize != m_fontSize) { |
| 748 m_fontSize = fontSize; | 748 m_fontSize = fontSize; |
| 749 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); | 749 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); |
| 750 } | 750 } |
| 751 } | 751 } |
| 752 | 752 |
| 753 // ---------------------------- | 753 // ---------------------------- |
| 754 | 754 |
| 755 } // namespace WebCore | 755 } // namespace WebCore |
| OLD | NEW |