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

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

Issue 335963002: Change LayoutState to be stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix push function to match old behavior... Created 6 years, 6 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
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 RenderBox* controlsRenderer = toRenderBox(m_children.firstChild()); 56 RenderBox* controlsRenderer = toRenderBox(m_children.firstChild());
57 if (!controlsRenderer) 57 if (!controlsRenderer)
58 return; 58 return;
59 59
60 bool controlsNeedLayout = controlsRenderer->needsLayout(); 60 bool controlsNeedLayout = controlsRenderer->needsLayout();
61 LayoutSize newSize = contentBoxRect().size(); 61 LayoutSize newSize = contentBoxRect().size();
62 if (newSize == oldSize && !controlsNeedLayout) 62 if (newSize == oldSize && !controlsNeedLayout)
63 return; 63 return;
64 64
65 LayoutStateMaintainer statePusher(*this, locationOffset()); 65 LayoutState state(*this, locationOffset());
66 66
67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou tSize(paddingLeft(), paddingTop())); 67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou tSize(paddingLeft(), paddingTop()));
68 controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed)); 68 controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed));
69 controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed)); 69 controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed));
70 controlsRenderer->forceLayout(); 70 controlsRenderer->forceLayout();
71 clearNeedsLayout(); 71 clearNeedsLayout();
72 } 72 }
73 73
74 void RenderMedia::paintReplaced(PaintInfo&, const LayoutPoint&) 74 void RenderMedia::paintReplaced(PaintInfo&, const LayoutPoint&)
75 { 75 {
76 } 76 }
77 77
78 } // namespace WebCore 78 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698