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

Side by Side Diff: Source/platform/Length.cpp

Issue 845313010: Allow Length::nonNanCalculatedValue to take a LayoutUnit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address comments Created 5 years, 11 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 | « Source/platform/Length.h ('k') | Source/platform/LengthFunctions.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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller ( mueller@kde.org ) 4 * (C) 2001 Dirk Mueller ( mueller@kde.org )
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 ASSERT(isCalculated()); 225 ASSERT(isCalculated());
226 calculationValue().ref(); 226 calculationValue().ref();
227 } 227 }
228 228
229 void Length::decrementCalculatedRef() const 229 void Length::decrementCalculatedRef() const
230 { 230 {
231 ASSERT(isCalculated()); 231 ASSERT(isCalculated());
232 calcHandles().decrementRef(calculationHandle()); 232 calcHandles().decrementRef(calculationHandle());
233 } 233 }
234 234
235 float Length::nonNanCalculatedValue(int maxValue) const 235 float Length::nonNanCalculatedValue(LayoutUnit maxValue) const
236 { 236 {
237 ASSERT(isCalculated()); 237 ASSERT(isCalculated());
238 float result = calculationValue().evaluate(maxValue); 238 float result = calculationValue().evaluate(maxValue.toFloat());
239 if (std::isnan(result)) 239 if (std::isnan(result))
240 return 0; 240 return 0;
241 return result; 241 return result;
242 } 242 }
243 243
244 bool Length::isCalculatedEqual(const Length& o) const 244 bool Length::isCalculatedEqual(const Length& o) const
245 { 245 {
246 return isCalculated() && (&calculationValue() == &o.calculationValue() || ca lculationValue() == o.calculationValue()); 246 return isCalculated() && (&calculationValue() == &o.calculationValue() || ca lculationValue() == o.calculationValue());
247 } 247 }
248 248
249 struct SameSizeAsLength { 249 struct SameSizeAsLength {
250 int32_t value; 250 int32_t value;
251 int32_t metaData; 251 int32_t metaData;
252 }; 252 };
253 static_assert(sizeof(Length) == sizeof(SameSizeAsLength), "length should stay sm all"); 253 static_assert(sizeof(Length) == sizeof(SameSizeAsLength), "length should stay sm all");
254 254
255 } // namespace blink 255 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/Length.h ('k') | Source/platform/LengthFunctions.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698