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

Side by Side Diff: Source/core/html/track/TextTrackContainer.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/track/TextTrackContainer.h ('k') | Source/core/html/track/vtt/VTTCue.h » ('j') | 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 30 matching lines...) Expand all
41 { 41 {
42 } 42 }
43 43
44 PassRefPtrWillBeRawPtr<TextTrackContainer> TextTrackContainer::create(Document& document) 44 PassRefPtrWillBeRawPtr<TextTrackContainer> TextTrackContainer::create(Document& document)
45 { 45 {
46 RefPtrWillBeRawPtr<TextTrackContainer> element = adoptRefWillBeNoop(new Text TrackContainer(document)); 46 RefPtrWillBeRawPtr<TextTrackContainer> element = adoptRefWillBeNoop(new Text TrackContainer(document));
47 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container" , AtomicString::ConstructFromLiteral)); 47 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container" , AtomicString::ConstructFromLiteral));
48 return element.release(); 48 return element.release();
49 } 49 }
50 50
51 LayoutObject* TextTrackContainer::createLayoutObject(const LayoutStyle&) 51 LayoutObject* TextTrackContainer::createLayoutObject(const ComputedStyle&)
52 { 52 {
53 return new LayoutTextTrackContainer(this); 53 return new LayoutTextTrackContainer(this);
54 } 54 }
55 55
56 void TextTrackContainer::updateDisplay(HTMLMediaElement& mediaElement, ExposingC ontrols exposingControls) 56 void TextTrackContainer::updateDisplay(HTMLMediaElement& mediaElement, ExposingC ontrols exposingControls)
57 { 57 {
58 if (!mediaElement.closedCaptionsVisible()) { 58 if (!mediaElement.closedCaptionsVisible()) {
59 removeChildren(); 59 removeChildren();
60 return; 60 return;
61 } 61 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 cue->updateDisplay(*this); 123 cue->updateDisplay(*this);
124 cue->updatePastAndFutureNodes(movieTime); 124 cue->updatePastAndFutureNodes(movieTime);
125 } 125 }
126 126
127 // 11. Return output. 127 // 11. Return output.
128 // See the note for step 3 for why there is no output to return. 128 // See the note for step 3 for why there is no output to return.
129 } 129 }
130 130
131 } // namespace blink 131 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackContainer.h ('k') | Source/core/html/track/vtt/VTTCue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698