Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: Source/core/html/shadow/MediaControlElements.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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(const Render Style&) 620 LayoutObject* 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
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
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.h ('k') | Source/core/html/shadow/MeterShadowElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698