| 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 TextTrackCue* cue = activeCues[i].data(); | 709 TextTrackCue* cue = activeCues[i].data(); |
| 710 | 710 |
| 711 ASSERT(cue->isActive()); | 711 ASSERT(cue->isActive()); |
| 712 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive()) | 712 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive()) |
| 713 continue; | 713 continue; |
| 714 | 714 |
| 715 cue->updateDisplay(m_videoDisplaySize.size(), *this); | 715 cue->updateDisplay(m_videoDisplaySize.size(), *this); |
| 716 } | 716 } |
| 717 | 717 |
| 718 // 11. Return output. | 718 // 11. Return output. |
| 719 if (hasChildNodes()) | 719 if (hasChildren()) |
| 720 show(); | 720 show(); |
| 721 else | 721 else |
| 722 hide(); | 722 hide(); |
| 723 } | 723 } |
| 724 | 724 |
| 725 void MediaControlTextTrackContainerElement::updateSizes() | 725 void MediaControlTextTrackContainerElement::updateSizes() |
| 726 { | 726 { |
| 727 HTMLMediaElement* mediaElement = toParentMediaElement(this); | 727 HTMLMediaElement* mediaElement = toParentMediaElement(this); |
| 728 if (!mediaElement) | 728 if (!mediaElement) |
| 729 return; | 729 return; |
| (...skipping 16 matching lines...) Expand all 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 |