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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp

Issue 2003453002: Clamp, not cast length value in CSS length conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 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 | « third_party/WebKit/LayoutTests/fast/text/letter-spacing-crash-expected.html ('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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 return roundForImpreciseConversion<short>(computeLengthDouble(conversionData )); 401 return roundForImpreciseConversion<short>(computeLengthDouble(conversionData ));
402 } 402 }
403 403
404 template<> unsigned short CSSPrimitiveValue::computeLength(const CSSToLengthConv ersionData& conversionData) const 404 template<> unsigned short CSSPrimitiveValue::computeLength(const CSSToLengthConv ersionData& conversionData) const
405 { 405 {
406 return roundForImpreciseConversion<unsigned short>(computeLengthDouble(conve rsionData)); 406 return roundForImpreciseConversion<unsigned short>(computeLengthDouble(conve rsionData));
407 } 407 }
408 408
409 template<> float CSSPrimitiveValue::computeLength(const CSSToLengthConversionDat a& conversionData) const 409 template<> float CSSPrimitiveValue::computeLength(const CSSToLengthConversionDat a& conversionData) const
410 { 410 {
411 return static_cast<float>(computeLengthDouble(conversionData)); 411 return clampTo<float>(computeLengthDouble(conversionData));
412 } 412 }
413 413
414 template<> double CSSPrimitiveValue::computeLength(const CSSToLengthConversionDa ta& conversionData) const 414 template<> double CSSPrimitiveValue::computeLength(const CSSToLengthConversionDa ta& conversionData) const
415 { 415 {
416 return computeLengthDouble(conversionData); 416 return computeLengthDouble(conversionData);
417 } 417 }
418 418
419 double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c onversionData) const 419 double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c onversionData) const
420 { 420 {
421 if (type() == UnitType::Calc) 421 if (type() == UnitType::Calc)
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 case UnitType::Calc: 834 case UnitType::Calc:
835 visitor->trace(m_value.calc); 835 visitor->trace(m_value.calc);
836 break; 836 break;
837 default: 837 default:
838 break; 838 break;
839 } 839 }
840 CSSValue::traceAfterDispatch(visitor); 840 CSSValue::traceAfterDispatch(visitor);
841 } 841 }
842 842
843 } // namespace blink 843 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/text/letter-spacing-crash-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698