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

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

Issue 55843002: Length type Relative is now unused. Remove it. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@length-relative-die-step-3-4
Patch Set: Created 7 years, 1 month 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 | « Source/core/css/CSSPrimitiveValue.cpp ('k') | Source/platform/Length.h » ('j') | 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 3007 matching lines...) Expand 10 before | Expand all | Expand 10 after
3018 // https://bugs.webkit.org/show_bug.cgi?id=91071 3018 // https://bugs.webkit.org/show_bug.cgi?id=91071
3019 if (logicalWidth.isIntrinsic()) 3019 if (logicalWidth.isIntrinsic())
3020 return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borde rAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth(); 3020 return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borde rAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth();
3021 if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerL ogicalWidth.isPercent()))) 3021 if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerL ogicalWidth.isPercent())))
3022 return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForL ength(logicalWidth, cw)); 3022 return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForL ength(logicalWidth, cw));
3023 } 3023 }
3024 // fall through 3024 // fall through
3025 case Intrinsic: 3025 case Intrinsic:
3026 case MinIntrinsic: 3026 case MinIntrinsic:
3027 case Auto: 3027 case Auto:
3028 case Relative:
3029 case ExtendToZoom: 3028 case ExtendToZoom:
3030 case Undefined: 3029 case Undefined:
3031 return intrinsicLogicalWidth(); 3030 return intrinsicLogicalWidth();
3032 } 3031 }
3033 3032
3034 ASSERT_NOT_REACHED(); 3033 ASSERT_NOT_REACHED();
3035 return 0; 3034 return 0;
3036 } 3035 }
3037 3036
3038 LayoutUnit RenderBox::computeReplacedLogicalHeight() const 3037 LayoutUnit RenderBox::computeReplacedLogicalHeight() const
(...skipping 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after
4974 return 0; 4973 return 0;
4975 4974
4976 if (!layoutState && !flowThreadContainingBlock()) 4975 if (!layoutState && !flowThreadContainingBlock())
4977 return 0; 4976 return 0;
4978 4977
4979 RenderBlock* containerBlock = containingBlock(); 4978 RenderBlock* containerBlock = containingBlock();
4980 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4979 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4981 } 4980 }
4982 4981
4983 } // namespace WebCore 4982 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | Source/platform/Length.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698