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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/css/CSSLengthFunctions.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/CSSCalculationValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.cpp » ('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 Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 3 Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
4 Copyright (C) 2011 Rik Cabanier (cabanier@adobe.com) 4 Copyright (C) 2011 Rik Cabanier (cabanier@adobe.com)
5 Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 Copyright (C) 2012 Motorola Mobility, Inc. All rights reserved. 6 Copyright (C) 2012 Motorola Mobility, Inc. All rights reserved.
7 Copyright (C) 2013 Google, Inc. All rights reserved. 7 Copyright (C) 2013 Google, Inc. 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return renderView ? renderView->viewportPercentageWidth(length.viewportP ercentageLength()) : LayoutUnit(0); 58 return renderView ? renderView->viewportPercentageWidth(length.viewportP ercentageLength()) : LayoutUnit(0);
59 case ViewportPercentageHeight: 59 case ViewportPercentageHeight:
60 return renderView ? renderView->viewportPercentageHeight(length.viewport PercentageLength()) : LayoutUnit(0); 60 return renderView ? renderView->viewportPercentageHeight(length.viewport PercentageLength()) : LayoutUnit(0);
61 case ViewportPercentageMin: 61 case ViewportPercentageMin:
62 return renderView ? renderView->viewportPercentageMin(length.viewportPer centageLength()) : LayoutUnit(0); 62 return renderView ? renderView->viewportPercentageMin(length.viewportPer centageLength()) : LayoutUnit(0);
63 case ViewportPercentageMax: 63 case ViewportPercentageMax:
64 return renderView ? renderView->viewportPercentageMax(length.viewportPer centageLength()) : LayoutUnit(0); 64 return renderView ? renderView->viewportPercentageMax(length.viewportPer centageLength()) : LayoutUnit(0);
65 case FillAvailable: 65 case FillAvailable:
66 case Auto: 66 case Auto:
67 return 0; 67 return 0;
68 case Relative:
69 case Intrinsic: 68 case Intrinsic:
70 case MinIntrinsic: 69 case MinIntrinsic:
71 case MinContent: 70 case MinContent:
72 case MaxContent: 71 case MaxContent:
73 case FitContent: 72 case FitContent:
74 case ExtendToZoom: 73 case ExtendToZoom:
75 case Undefined: 74 case Undefined:
76 ASSERT_NOT_REACHED(); 75 ASSERT_NOT_REACHED();
77 return 0; 76 return 0;
78 } 77 }
79 ASSERT_NOT_REACHED(); 78 ASSERT_NOT_REACHED();
80 return 0; 79 return 0;
81 } 80 }
82 81
83 LayoutUnit valueForLength(const Length& length, LayoutUnit maximumValue, RenderV iew* renderView, bool roundPercentages) 82 LayoutUnit valueForLength(const Length& length, LayoutUnit maximumValue, RenderV iew* renderView, bool roundPercentages)
84 { 83 {
85 switch (length.type()) { 84 switch (length.type()) {
86 case Fixed: 85 case Fixed:
87 case Percent: 86 case Percent:
88 case Calculated: 87 case Calculated:
89 case ViewportPercentageWidth: 88 case ViewportPercentageWidth:
90 case ViewportPercentageHeight: 89 case ViewportPercentageHeight:
91 case ViewportPercentageMin: 90 case ViewportPercentageMin:
92 case ViewportPercentageMax: 91 case ViewportPercentageMax:
93 return minimumValueForLength(length, maximumValue, renderView, roundPerc entages); 92 return minimumValueForLength(length, maximumValue, renderView, roundPerc entages);
94 case FillAvailable: 93 case FillAvailable:
95 case Auto: 94 case Auto:
96 return maximumValue; 95 return maximumValue;
97 case Relative:
98 case Intrinsic: 96 case Intrinsic:
99 case MinIntrinsic: 97 case MinIntrinsic:
100 case MinContent: 98 case MinContent:
101 case MaxContent: 99 case MaxContent:
102 case FitContent: 100 case FitContent:
103 case ExtendToZoom: 101 case ExtendToZoom:
104 case Undefined: 102 case Undefined:
105 ASSERT_NOT_REACHED(); 103 ASSERT_NOT_REACHED();
106 return 0; 104 return 0;
107 } 105 }
(...skipping 19 matching lines...) Expand all
127 case Calculated: 125 case Calculated:
128 return length.nonNanCalculatedValue(maximumValue); 126 return length.nonNanCalculatedValue(maximumValue);
129 case ViewportPercentageWidth: 127 case ViewportPercentageWidth:
130 return static_cast<int>(renderView->viewportPercentageWidth(length.viewp ortPercentageLength())); 128 return static_cast<int>(renderView->viewportPercentageWidth(length.viewp ortPercentageLength()));
131 case ViewportPercentageHeight: 129 case ViewportPercentageHeight:
132 return static_cast<int>(renderView->viewportPercentageHeight(length.view portPercentageLength())); 130 return static_cast<int>(renderView->viewportPercentageHeight(length.view portPercentageLength()));
133 case ViewportPercentageMin: 131 case ViewportPercentageMin:
134 return static_cast<int>(renderView->viewportPercentageMin(length.viewpor tPercentageLength())); 132 return static_cast<int>(renderView->viewportPercentageMin(length.viewpor tPercentageLength()));
135 case ViewportPercentageMax: 133 case ViewportPercentageMax:
136 return static_cast<int>(renderView->viewportPercentageMax(length.viewpor tPercentageLength())); 134 return static_cast<int>(renderView->viewportPercentageMax(length.viewpor tPercentageLength()));
137 case Relative:
138 case Intrinsic: 135 case Intrinsic:
139 case MinIntrinsic: 136 case MinIntrinsic:
140 case MinContent: 137 case MinContent:
141 case MaxContent: 138 case MaxContent:
142 case FitContent: 139 case FitContent:
143 case ExtendToZoom: 140 case ExtendToZoom:
144 case Undefined: 141 case Undefined:
145 ASSERT_NOT_REACHED(); 142 ASSERT_NOT_REACHED();
146 return 0; 143 return 0;
147 } 144 }
148 ASSERT_NOT_REACHED(); 145 ASSERT_NOT_REACHED();
149 return 0; 146 return 0;
150 } 147 }
151 148
152 } // namespace WebCore 149 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSCalculationValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698