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

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

Issue 196533012: Make LayoutState always be RAII (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated to ToT Created 6 years, 9 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 if (newSize == oldSize && !childBox->needsLayout()) 232 if (newSize == oldSize && !childBox->needsLayout())
233 return; 233 return;
234 234
235 LayoutStateMaintainer statePusher(*this, locationOffset()); 235 LayoutStateMaintainer statePusher(*this, locationOffset());
236 236
237 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop())); 237 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop()));
238 childBox->style()->setHeight(Length(newSize.height(), Fixed)); 238 childBox->style()->setHeight(Length(newSize.height(), Fixed));
239 childBox->style()->setWidth(Length(newSize.width(), Fixed)); 239 childBox->style()->setWidth(Length(newSize.width(), Fixed));
240 childBox->forceLayout(); 240 childBox->forceLayout();
241 clearNeedsLayout(); 241 clearNeedsLayout();
242
243 statePusher.pop();
244 } 242 }
245 243
246 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float) 244 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float)
247 { 245 {
248 return false; 246 return false;
249 } 247 }
250 248
251 bool RenderEmbeddedObject::canHaveChildren() const 249 bool RenderEmbeddedObject::canHaveChildren() const
252 { 250 {
253 return false; 251 return false;
254 } 252 }
255 253
256 } 254 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderDeprecatedFlexibleBox.cpp ('k') | Source/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698