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

Side by Side Diff: Source/core/rendering/RenderVideo.cpp

Issue 26270004: Element should not use confusingAndOftenMisusedAttached (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 1 month 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/HTMLMediaElement.cpp ('k') | no next file » | 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) 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
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
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
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698