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

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

Issue 23668002: Avoid leaking ThreadingPrimitives.h from StackStats.h when collection is off. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/rendering/RenderTextTrackCue.cpp ('k') | Source/core/rendering/RenderView.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) 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 mediaPlayer->paintCurrentFrameInContext(context, pixelSnappedIntRect(rec t)); 193 mediaPlayer->paintCurrentFrameInContext(context, pixelSnappedIntRect(rec t));
194 else 194 else
195 mediaPlayer->paint(context, pixelSnappedIntRect(rect)); 195 mediaPlayer->paint(context, pixelSnappedIntRect(rect));
196 196
197 if (clip) 197 if (clip)
198 context->restore(); 198 context->restore();
199 } 199 }
200 200
201 void RenderVideo::layout() 201 void RenderVideo::layout()
202 { 202 {
203 StackStats::LayoutCheckPoint layoutCheckPoint;
204 RenderMedia::layout(); 203 RenderMedia::layout();
205 updatePlayer(); 204 updatePlayer();
206 } 205 }
207 206
208 HTMLVideoElement* RenderVideo::videoElement() const 207 HTMLVideoElement* RenderVideo::videoElement() const
209 { 208 {
210 ASSERT(isHTMLVideoElement(node())); 209 ASSERT(isHTMLVideoElement(node()));
211 return toHTMLVideoElement(node()); 210 return toHTMLVideoElement(node());
212 } 211 }
213 212
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 } 289 }
291 290
292 LayoutUnit RenderVideo::offsetHeight() const 291 LayoutUnit RenderVideo::offsetHeight() const
293 { 292 {
294 if (const RenderBlock* block = rendererPlaceholder(this)) 293 if (const RenderBlock* block = rendererPlaceholder(this))
295 return block->offsetHeight(); 294 return block->offsetHeight();
296 return RenderMedia::offsetHeight(); 295 return RenderMedia::offsetHeight();
297 } 296 }
298 297
299 } // namespace WebCore 298 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextTrackCue.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698