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

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

Issue 200713004: Replace HTMLMediaElement::isVideo() with isHTMLVideoElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/core/html/HTMLVideoElement.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 void MediaControlTextTrackContainerElement::updateDisplay() 697 void MediaControlTextTrackContainerElement::updateDisplay()
698 { 698 {
699 if (!mediaControllerInterface().closedCaptionsVisible()) { 699 if (!mediaControllerInterface().closedCaptionsVisible()) {
700 removeChildren(); 700 removeChildren();
701 return; 701 return;
702 } 702 }
703 703
704 // 1. If the media element is an audio element, or is another playback 704 // 1. If the media element is an audio element, or is another playback
705 // mechanism with no rendering area, abort these steps. There is nothing to 705 // mechanism with no rendering area, abort these steps. There is nothing to
706 // render. 706 // render.
707 if (!mediaElement().isVideo()) 707 if (isHTMLAudioElement(mediaElement()))
708 return; 708 return;
709 709
710 // 2. Let video be the media element or other playback mechanism. 710 // 2. Let video be the media element or other playback mechanism.
711 HTMLVideoElement& video = toHTMLVideoElement(mediaElement()); 711 HTMLVideoElement& video = toHTMLVideoElement(mediaElement());
712 712
713 // 3. Let output be an empty list of absolutely positioned CSS block boxes. 713 // 3. Let output be an empty list of absolutely positioned CSS block boxes.
714 Vector<RefPtr<HTMLDivElement> > output; 714 Vector<RefPtr<HTMLDivElement> > output;
715 715
716 // 4. If the user agent is exposing a user interface for video, add to 716 // 4. If the user agent is exposing a user interface for video, add to
717 // output one or more completely transparent positioned CSS block boxes that 717 // output one or more completely transparent positioned CSS block boxes that
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 float fontSize = smallestDimension * 0.05f; 782 float fontSize = smallestDimension * 0.05f;
783 if (fontSize != m_fontSize) { 783 if (fontSize != m_fontSize) {
784 m_fontSize = fontSize; 784 m_fontSize = fontSize;
785 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 785 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
786 } 786 }
787 } 787 }
788 788
789 // ---------------------------- 789 // ----------------------------
790 790
791 } // namespace WebCore 791 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLVideoElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698