| 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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 } | 610 } |
| 611 | 611 |
| 612 PassRefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> MediaControlTextTr
ackContainerElement::create(MediaControls& mediaControls) | 612 PassRefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> MediaControlTextTr
ackContainerElement::create(MediaControls& mediaControls) |
| 613 { | 613 { |
| 614 RefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> element = adoptRef
WillBeNoop(new MediaControlTextTrackContainerElement(mediaControls)); | 614 RefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> element = adoptRef
WillBeNoop(new MediaControlTextTrackContainerElement(mediaControls)); |
| 615 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container"
, AtomicString::ConstructFromLiteral)); | 615 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container"
, AtomicString::ConstructFromLiteral)); |
| 616 element->hide(); | 616 element->hide(); |
| 617 return element.release(); | 617 return element.release(); |
| 618 } | 618 } |
| 619 | 619 |
| 620 RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderStyle*
) | 620 RenderObject* MediaControlTextTrackContainerElement::createRenderer(const Render
Style*) |
| 621 { | 621 { |
| 622 return new RenderTextTrackContainerElement(this); | 622 return new RenderTextTrackContainerElement(this); |
| 623 } | 623 } |
| 624 | 624 |
| 625 void MediaControlTextTrackContainerElement::updateDisplay() | 625 void MediaControlTextTrackContainerElement::updateDisplay() |
| 626 { | 626 { |
| 627 if (!mediaElement().closedCaptionsVisible()) { | 627 if (!mediaElement().closedCaptionsVisible()) { |
| 628 removeChildren(); | 628 removeChildren(); |
| 629 return; | 629 return; |
| 630 } | 630 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 float fontSize = smallestDimension * 0.05f; | 709 float fontSize = smallestDimension * 0.05f; |
| 710 if (fontSize != m_fontSize) { | 710 if (fontSize != m_fontSize) { |
| 711 m_fontSize = fontSize; | 711 m_fontSize = fontSize; |
| 712 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); | 712 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); |
| 713 } | 713 } |
| 714 } | 714 } |
| 715 | 715 |
| 716 // ---------------------------- | 716 // ---------------------------- |
| 717 | 717 |
| 718 } // namespace blink | 718 } // namespace blink |
| OLD | NEW |