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

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

Issue 1987223002: Clamp, not cast length value in CSS length conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove spurious newline 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 return roundForImpreciseConversion<short>(computeLengthDouble(conversionData )); 350 return roundForImpreciseConversion<short>(computeLengthDouble(conversionData ));
351 } 351 }
352 352
353 template<> unsigned short CSSPrimitiveValue::computeLength(const CSSToLengthConv ersionData& conversionData) const 353 template<> unsigned short CSSPrimitiveValue::computeLength(const CSSToLengthConv ersionData& conversionData) const
354 { 354 {
355 return roundForImpreciseConversion<unsigned short>(computeLengthDouble(conve rsionData)); 355 return roundForImpreciseConversion<unsigned short>(computeLengthDouble(conve rsionData));
356 } 356 }
357 357
358 template<> float CSSPrimitiveValue::computeLength(const CSSToLengthConversionDat a& conversionData) const 358 template<> float CSSPrimitiveValue::computeLength(const CSSToLengthConversionDat a& conversionData) const
359 { 359 {
360 return static_cast<float>(computeLengthDouble(conversionData)); 360 return clampTo<float>(computeLengthDouble(conversionData));
361 } 361 }
362 362
363 template<> double CSSPrimitiveValue::computeLength(const CSSToLengthConversionDa ta& conversionData) const 363 template<> double CSSPrimitiveValue::computeLength(const CSSToLengthConversionDa ta& conversionData) const
364 { 364 {
365 return computeLengthDouble(conversionData); 365 return computeLengthDouble(conversionData);
366 } 366 }
367 367
368 double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c onversionData) const 368 double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c onversionData) const
369 { 369 {
370 if (type() == UnitType::Calc) 370 if (type() == UnitType::Calc)
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 case UnitType::Calc: 774 case UnitType::Calc:
775 visitor->trace(m_value.calc); 775 visitor->trace(m_value.calc);
776 break; 776 break;
777 default: 777 default:
778 break; 778 break;
779 } 779 }
780 CSSValue::traceAfterDispatch(visitor); 780 CSSValue::traceAfterDispatch(visitor);
781 } 781 }
782 782
783 } // namespace blink 783 } // 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