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

Side by Side Diff: Source/core/html/track/vtt/VTTCue.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
« no previous file with comments | « Source/core/html/track/vtt/VTTCue.h ('k') | Source/core/html/track/vtt/VTTRegion.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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // of the way across the height of the video's rendering area, while 199 // of the way across the height of the video's rendering area, while
200 // maintaining the relative positions of the boxes in boxes to each 200 // maintaining the relative positions of the boxes in boxes to each
201 // other. 201 // other.
202 setInlineStyleProperty(CSSPropertyWebkitTransform, 202 setInlineStyleProperty(CSSPropertyWebkitTransform,
203 String::format("translate(-%.2f%%, -%.2f%%)", position.x(), position .y())); 203 String::format("translate(-%.2f%%, -%.2f%%)", position.x(), position .y()));
204 204
205 setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre); 205 setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre);
206 } 206 }
207 } 207 }
208 208
209 RenderObject* VTTCueBox::createRenderer(const RenderStyle&) 209 LayoutObject* VTTCueBox::createRenderer(const RenderStyle&)
210 { 210 {
211 return new RenderVTTCue(this); 211 return new RenderVTTCue(this);
212 } 212 }
213 213
214 void VTTCueBox::trace(Visitor* visitor) 214 void VTTCueBox::trace(Visitor* visitor)
215 { 215 {
216 visitor->trace(m_cue); 216 visitor->trace(m_cue);
217 HTMLDivElement::trace(visitor); 217 HTMLDivElement::trace(visitor);
218 } 218 }
219 219
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 1134
1135 void VTTCue::trace(Visitor* visitor) 1135 void VTTCue::trace(Visitor* visitor)
1136 { 1136 {
1137 visitor->trace(m_vttNodeTree); 1137 visitor->trace(m_vttNodeTree);
1138 visitor->trace(m_cueBackgroundBox); 1138 visitor->trace(m_cueBackgroundBox);
1139 visitor->trace(m_displayTree); 1139 visitor->trace(m_displayTree);
1140 TextTrackCue::trace(visitor); 1140 TextTrackCue::trace(visitor);
1141 } 1141 }
1142 1142
1143 } // namespace blink 1143 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/vtt/VTTCue.h ('k') | Source/core/html/track/vtt/VTTRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698