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

Side by Side Diff: Source/core/html/track/vtt/VTTCue.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/vtt/VTTCue.h ('k') | Source/core/inspector/InspectorCSSAgent.cpp » ('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) 2013, Opera Software ASA. All rights reserved. 2 * Copyright (c) 2013, Opera Software ASA. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // of the way across the height of the video's rendering area, while 208 // of the way across the height of the video's rendering area, while
209 // maintaining the relative positions of the boxes in boxes to each 209 // maintaining the relative positions of the boxes in boxes to each
210 // other. 210 // other.
211 setInlineStyleProperty(CSSPropertyWebkitTransform, 211 setInlineStyleProperty(CSSPropertyWebkitTransform,
212 String::format("translate(-%.2f%%, -%.2f%%)", position.x(), position .y())); 212 String::format("translate(-%.2f%%, -%.2f%%)", position.x(), position .y()));
213 213
214 setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre); 214 setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre);
215 } 215 }
216 } 216 }
217 217
218 LayoutObject* VTTCueBox::createLayoutObject(const LayoutStyle&) 218 LayoutObject* VTTCueBox::createLayoutObject(const ComputedStyle&)
219 { 219 {
220 return new LayoutVTTCue(this); 220 return new LayoutVTTCue(this);
221 } 221 }
222 222
223 DEFINE_TRACE(VTTCueBox) 223 DEFINE_TRACE(VTTCueBox)
224 { 224 {
225 visitor->trace(m_cue); 225 visitor->trace(m_cue);
226 HTMLDivElement::trace(visitor); 226 HTMLDivElement::trace(visitor);
227 } 227 }
228 228
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 1133
1134 DEFINE_TRACE(VTTCue) 1134 DEFINE_TRACE(VTTCue)
1135 { 1135 {
1136 visitor->trace(m_vttNodeTree); 1136 visitor->trace(m_vttNodeTree);
1137 visitor->trace(m_cueBackgroundBox); 1137 visitor->trace(m_cueBackgroundBox);
1138 visitor->trace(m_displayTree); 1138 visitor->trace(m_displayTree);
1139 TextTrackCue::trace(visitor); 1139 TextTrackCue::trace(visitor);
1140 } 1140 }
1141 1141
1142 } // namespace blink 1142 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/vtt/VTTCue.h ('k') | Source/core/inspector/InspectorCSSAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698