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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 2358473002: Renamed EFloat members to match keywords (Closed)
Patch Set: Rebase Created 4 years, 3 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) 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 LayoutUnit maxRight = marginLogicalRight > 0 ? std::max(floatRig htWidth, marginLogicalRight) : floatRightWidth + marginLogicalRight; 1377 LayoutUnit maxRight = marginLogicalRight > 0 ? std::max(floatRig htWidth, marginLogicalRight) : floatRightWidth + marginLogicalRight;
1378 w = childMaxPreferredLogicalWidth + maxLeft + maxRight; 1378 w = childMaxPreferredLogicalWidth + maxLeft + maxRight;
1379 w = std::max(w, floatLeftWidth + floatRightWidth); 1379 w = std::max(w, floatLeftWidth + floatRightWidth);
1380 } else { 1380 } else {
1381 maxLogicalWidth = std::max(floatLeftWidth + floatRightWidth, max LogicalWidth); 1381 maxLogicalWidth = std::max(floatLeftWidth + floatRightWidth, max LogicalWidth);
1382 } 1382 }
1383 floatLeftWidth = floatRightWidth = LayoutUnit(); 1383 floatLeftWidth = floatRightWidth = LayoutUnit();
1384 } 1384 }
1385 1385
1386 if (child->isFloating()) { 1386 if (child->isFloating()) {
1387 if (childStyle->floating() == EFloat::LeftFloat) 1387 if (childStyle->floating() == EFloat::Left)
1388 floatLeftWidth += w; 1388 floatLeftWidth += w;
1389 else 1389 else
1390 floatRightWidth += w; 1390 floatRightWidth += w;
1391 } else { 1391 } else {
1392 maxLogicalWidth = std::max(w, maxLogicalWidth); 1392 maxLogicalWidth = std::max(w, maxLogicalWidth);
1393 } 1393 }
1394 1394
1395 child = child->nextSibling(); 1395 child = child->nextSibling();
1396 } 1396 }
1397 1397
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1948 1948
1949 return availableHeight; 1949 return availableHeight;
1950 } 1950 }
1951 1951
1952 bool LayoutBlock::hasDefiniteLogicalHeight() const 1952 bool LayoutBlock::hasDefiniteLogicalHeight() const
1953 { 1953 {
1954 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 1954 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
1955 } 1955 }
1956 1956
1957 } // namespace blink 1957 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698