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

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: ceiledTextIndent Created 7 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
« 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 6048 matching lines...) Expand 10 before | Expand all | Expand 10 after
6059 inlineMin = 0; 6059 inlineMin = 0;
6060 } 6060 }
6061 6061
6062 // If we're supposed to clear the previous float, then terminate maxwidth as well. 6062 // If we're supposed to clear the previous float, then terminate maxwidth as well.
6063 if (clearPreviousFloat) { 6063 if (clearPreviousFloat) {
6064 updatePreferredWidth(maxLogicalWidth, inlineMax); 6064 updatePreferredWidth(maxLogicalWidth, inlineMax);
6065 inlineMax = 0; 6065 inlineMax = 0;
6066 } 6066 }
6067 6067
6068 // Add in text-indent. This is added in only once. 6068 // Add in text-indent. This is added in only once.
6069 LayoutUnit ti = 0;
6070 if (!addedTextIndent && !child->isFloating()) { 6069 if (!addedTextIndent && !child->isFloating()) {
6071 ti = textIndent; 6070 float ceiledTextIndent = textIndent.ceilToFloat();
6072 childMin += ti.ceilToFloat(); 6071 childMin += ceiledTextIndent;
6073 childMax += ti.ceilToFloat(); 6072 childMax += ceiledTextIndent;
6074 6073
6075 if (childMin < 0) 6074 if (childMin < 0)
6076 textIndent = adjustFloatForSubPixelLayout(childMin); 6075 textIndent = adjustFloatForSubPixelLayout(childMin);
6077 else 6076 else
6078 addedTextIndent = true; 6077 addedTextIndent = true;
6079 } 6078 }
6080 6079
6081 // Add our width to the max. 6080 // Add our width to the max.
6082 inlineMax += max<float>(0, childMax); 6081 inlineMax += max<float>(0, childMax);
6083 6082
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
8102 { 8101 {
8103 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); 8102 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8104 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); 8103 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8105 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); 8104 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8106 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); 8105 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8107 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); 8106 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8108 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); 8107 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8109 } 8108 }
8110 8109
8111 } // namespace WebCore 8110 } // 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