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

Side by Side Diff: Source/core/rendering/RenderMedia.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/RenderListMarker.cpp ('k') | Source/core/rendering/RenderObject.h » ('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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 { 50 {
51 } 51 }
52 52
53 HTMLMediaElement* RenderMedia::mediaElement() const 53 HTMLMediaElement* RenderMedia::mediaElement() const
54 { 54 {
55 return toHTMLMediaElement(node()); 55 return toHTMLMediaElement(node());
56 } 56 }
57 57
58 void RenderMedia::layout() 58 void RenderMedia::layout()
59 { 59 {
60 StackStats::LayoutCheckPoint layoutCheckPoint;
61 LayoutSize oldSize = contentBoxRect().size(); 60 LayoutSize oldSize = contentBoxRect().size();
62 61
63 RenderImage::layout(); 62 RenderImage::layout();
64 63
65 RenderBox* controlsRenderer = toRenderBox(m_children.firstChild()); 64 RenderBox* controlsRenderer = toRenderBox(m_children.firstChild());
66 if (!controlsRenderer) 65 if (!controlsRenderer)
67 return; 66 return;
68 67
69 bool controlsNeedLayout = controlsRenderer->needsLayout(); 68 bool controlsNeedLayout = controlsRenderer->needsLayout();
70 // If the region chain has changed we also need to relayout the controls to update the region box info. 69 // If the region chain has changed we also need to relayout the controls to update the region box info.
(...skipping 20 matching lines...) Expand all
91 clearNeedsLayout(); 90 clearNeedsLayout();
92 91
93 statePusher.pop(); 92 statePusher.pop();
94 } 93 }
95 94
96 void RenderMedia::paintReplaced(PaintInfo&, const LayoutPoint&) 95 void RenderMedia::paintReplaced(PaintInfo&, const LayoutPoint&)
97 { 96 {
98 } 97 }
99 98
100 } // namespace WebCore 99 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698