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

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

Issue 594533002: Replace HTMLMediaElement::isActive() with Node::inActiveDocument() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 173
174 void RenderVideo::updatePlayer() 174 void RenderVideo::updatePlayer()
175 { 175 {
176 updateIntrinsicSize(); 176 updateIntrinsicSize();
177 177
178 WebMediaPlayer* mediaPlayer = mediaElement()->webMediaPlayer(); 178 WebMediaPlayer* mediaPlayer = mediaElement()->webMediaPlayer();
179 if (!mediaPlayer) 179 if (!mediaPlayer)
180 return; 180 return;
181 181
182 if (!videoElement()->isActive()) 182 if (!videoElement()->inActiveDocument())
183 return; 183 return;
184 184
185 videoElement()->setNeedsCompositingUpdate(); 185 videoElement()->setNeedsCompositingUpdate();
186 } 186 }
187 187
188 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul dComputePreferred) const 188 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul dComputePreferred) const
189 { 189 {
190 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); 190 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred);
191 } 191 }
192 192
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 return CompositingReasonVideo; 254 return CompositingReasonVideo;
255 } 255 }
256 256
257 if (shouldDisplayVideo() && supportsAcceleratedRendering()) 257 if (shouldDisplayVideo() && supportsAcceleratedRendering())
258 return CompositingReasonVideo; 258 return CompositingReasonVideo;
259 259
260 return CompositingReasonNone; 260 return CompositingReasonNone;
261 } 261 }
262 262
263 } // namespace blink 263 } // namespace blink
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