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

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

Issue 10447005: Merge 116914 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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/WebCore/platform/Length.h ('k') | 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) 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 225
226 float Length::nonNanCalculatedValue(int maxValue) const 226 float Length::nonNanCalculatedValue(int maxValue) const
227 { 227 {
228 ASSERT(isCalculated()); 228 ASSERT(isCalculated());
229 float result = calculationValue()->evaluate(maxValue); 229 float result = calculationValue()->evaluate(maxValue);
230 if (isnan(result)) 230 if (isnan(result))
231 return 0; 231 return 0;
232 return result; 232 return result;
233 } 233 }
234 234
235 bool Length::isCalculatedEqual(const Length& o) const
236 {
237 return isCalculated() && (calculationValue() == o.calculationValue() || *cal culationValue() == *o.calculationValue());
238 }
239
235 class SameSizeAsLength { 240 class SameSizeAsLength {
236 int32_t value; 241 int32_t value;
237 int32_t metaData; 242 int32_t metaData;
238 }; 243 };
239 COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_sm all); 244 COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_sm all);
240 245
241 } // namespace WebCore 246 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/platform/Length.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698