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

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

Issue 869623002: VTTCue: Refactor display parameter handling (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 // 10. For each text track cue cue in cues that has not yet had 672 // 10. For each text track cue cue in cues that has not yet had
673 // corresponding CSS boxes added to output, in text track cue order, run the 673 // corresponding CSS boxes added to output, in text track cue order, run the
674 // following substeps: 674 // following substeps:
675 for (size_t i = 0; i < activeCues.size(); ++i) { 675 for (size_t i = 0; i < activeCues.size(); ++i) {
676 TextTrackCue* cue = activeCues[i].data(); 676 TextTrackCue* cue = activeCues[i].data();
677 677
678 ASSERT(cue->isActive()); 678 ASSERT(cue->isActive());
679 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive()) 679 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive())
680 continue; 680 continue;
681 681
682 cue->updateDisplay(m_videoDisplaySize.size(), *this); 682 cue->updateDisplay(*this);
683 } 683 }
684 684
685 // 11. Return output. 685 // 11. Return output.
686 if (hasChildren()) 686 if (hasChildren())
687 show(); 687 show();
688 else 688 else
689 hide(); 689 hide();
690 } 690 }
691 691
692 void MediaControlTextTrackContainerElement::updateSizes() 692 void MediaControlTextTrackContainerElement::updateSizes()
(...skipping 16 matching lines...) Expand all
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 | « no previous file | Source/core/html/track/TextTrackCue.h » ('j') | Source/core/html/track/vtt/VTTCue.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698