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

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

Issue 15991003: Avoid redundant ceilToFloat call in RenderBlock (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 6084 matching lines...) Expand 10 before | Expand all | Expand 10 after
6095 inlineMin = 0; 6095 inlineMin = 0;
6096 } 6096 }
6097 6097
6098 // If we're supposed to clear the previous float, then terminate maxwidth as well. 6098 // If we're supposed to clear the previous float, then terminate maxwidth as well.
6099 if (clearPreviousFloat) { 6099 if (clearPreviousFloat) {
6100 updatePreferredWidth(maxLogicalWidth, inlineMax); 6100 updatePreferredWidth(maxLogicalWidth, inlineMax);
6101 inlineMax = 0; 6101 inlineMax = 0;
6102 } 6102 }
6103 6103
6104 // Add in text-indent. This is added in only once. 6104 // Add in text-indent. This is added in only once.
6105 LayoutUnit ti = 0;
6106 if (!addedTextIndent && !child->isFloating()) { 6105 if (!addedTextIndent && !child->isFloating()) {
6107 ti = textIndent; 6106 float ti = textIndent.ceilToFloat();
Julien - ping for review 2013/06/06 19:46:18 Let's kill this abbreviation while at it and have
6108 childMin += ti.ceilToFloat(); 6107 childMin += ti;
6109 childMax += ti.ceilToFloat(); 6108 childMax += ti;
6110 6109
6111 if (childMin < 0) 6110 if (childMin < 0)
6112 textIndent = adjustFloatForSubPixelLayout(childMin); 6111 textIndent = adjustFloatForSubPixelLayout(childMin);
6113 else 6112 else
6114 addedTextIndent = true; 6113 addedTextIndent = true;
6115 } 6114 }
6116 6115
6117 // Add our width to the max. 6116 // Add our width to the max.
6118 inlineMax += max<float>(0, childMax); 6117 inlineMax += max<float>(0, childMax);
6119 6118
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
8138 { 8137 {
8139 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); 8138 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8140 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); 8139 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8141 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); 8140 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8142 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); 8141 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8143 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); 8142 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8144 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); 8143 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8145 } 8144 }
8146 8145
8147 } // namespace WebCore 8146 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698