OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 } | 197 } |
198 | 198 |
199 void RenderVideo::updatePlayer() | 199 void RenderVideo::updatePlayer() |
200 { | 200 { |
201 updateIntrinsicSize(); | 201 updateIntrinsicSize(); |
202 | 202 |
203 MediaPlayer* mediaPlayer = mediaElement()->player(); | 203 MediaPlayer* mediaPlayer = mediaElement()->player(); |
204 if (!mediaPlayer) | 204 if (!mediaPlayer) |
205 return; | 205 return; |
206 | 206 |
207 if (!videoElement()->inActiveDocument()) | 207 if (!videoElement()->isActive()) |
208 return; | 208 return; |
209 | 209 |
210 contentChanged(VideoChanged); | 210 contentChanged(VideoChanged); |
211 } | 211 } |
212 | 212 |
213 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const | 213 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const |
214 { | 214 { |
215 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); | 215 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); |
216 } | 216 } |
217 | 217 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 } | 269 } |
270 | 270 |
271 LayoutUnit RenderVideo::offsetHeight() const | 271 LayoutUnit RenderVideo::offsetHeight() const |
272 { | 272 { |
273 if (const RenderBlock* block = rendererPlaceholder(this)) | 273 if (const RenderBlock* block = rendererPlaceholder(this)) |
274 return block->offsetHeight(); | 274 return block->offsetHeight(); |
275 return RenderMedia::offsetHeight(); | 275 return RenderMedia::offsetHeight(); |
276 } | 276 } |
277 | 277 |
278 } // namespace WebCore | 278 } // namespace WebCore |
OLD | NEW |