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

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

Issue 162613007: Reduce the number of parameters to LayoutStateMaintainer by one (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // When calling layout() on a child node, a parent must either push a Layout StateMaintainter, or 234 // When calling layout() on a child node, a parent must either push a Layout StateMaintainter, or
235 // instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is s lightly more efficient, 235 // instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is s lightly more efficient,
236 // and this method will be called many times per second during playback, use a LayoutStateMaintainer: 236 // and this method will be called many times per second during playback, use a LayoutStateMaintainer:
237 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); 237 LayoutStateMaintainer statePusher(this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
238 238
239 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop())); 239 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa ddingLeft(), paddingTop()));
240 childBox->style()->setHeight(Length(newSize.height(), Fixed)); 240 childBox->style()->setHeight(Length(newSize.height(), Fixed));
241 childBox->style()->setWidth(Length(newSize.width(), Fixed)); 241 childBox->style()->setWidth(Length(newSize.width(), Fixed));
242 childBox->forceLayout(); 242 childBox->forceLayout();
243 clearNeedsLayout(); 243 clearNeedsLayout();
244 244
245 statePusher.pop(); 245 statePusher.pop();
246 } 246 }
247 247
248 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float) 248 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float)
249 { 249 {
250 return false; 250 return false;
251 } 251 }
252 252
253 bool RenderEmbeddedObject::canHaveChildren() const 253 bool RenderEmbeddedObject::canHaveChildren() const
254 { 254 {
255 return false; 255 return false;
256 } 256 }
257 257
258 } 258 }
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