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

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

Issue 164553004: Convert LayoutState/LayoutStateMaintainer/LayoutStateDisabler to references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 10 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
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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 RenderBox* childBox = toRenderBox(child); 225 RenderBox* childBox = toRenderBox(child);
226 226
227 if (!childBox) 227 if (!childBox)
228 return; 228 return;
229 229
230 LayoutSize newSize = contentBoxRect().size(); 230 LayoutSize newSize = contentBoxRect().size();
231 if (newSize == oldSize && !childBox->needsLayout()) 231 if (newSize == oldSize && !childBox->needsLayout())
232 return; 232 return;
233 233
234 LayoutStateMaintainer statePusher(this, locationOffset()); 234 LayoutStateMaintainer statePusher(*this, locationOffset());
235 235
236 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop())); 236 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop()));
237 childBox->style()->setHeight(Length(newSize.height(), Fixed)); 237 childBox->style()->setHeight(Length(newSize.height(), Fixed));
238 childBox->style()->setWidth(Length(newSize.width(), Fixed)); 238 childBox->style()->setWidth(Length(newSize.width(), Fixed));
239 childBox->forceLayout(); 239 childBox->forceLayout();
240 clearNeedsLayout(); 240 clearNeedsLayout();
241 241
242 statePusher.pop(); 242 statePusher.pop();
243 } 243 }
244 244
245 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float) 245 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float)
246 { 246 {
247 return false; 247 return false;
248 } 248 }
249 249
250 bool RenderEmbeddedObject::canHaveChildren() const 250 bool RenderEmbeddedObject::canHaveChildren() const
251 { 251 {
252 return false; 252 return false;
253 } 253 }
254 254
255 } 255 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderDeprecatedFlexibleBox.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698