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

Side by Side Diff: third_party/WebKit/Source/platform/LengthFunctions.cpp

Issue 2261663002: Disallow cast/implicit conversion from LayoutUnit to int/unsigned (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: - Created 4 years, 3 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
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 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 13 matching lines...) Expand all
24 #include "platform/LengthFunctions.h" 24 #include "platform/LengthFunctions.h"
25 25
26 #include "platform/LayoutUnit.h" 26 #include "platform/LayoutUnit.h"
27 #include "platform/LengthPoint.h" 27 #include "platform/LengthPoint.h"
28 #include "platform/LengthSize.h" 28 #include "platform/LengthSize.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 int intValueForLength(const Length& length, int maximumValue) 32 int intValueForLength(const Length& length, int maximumValue)
33 { 33 {
34 return static_cast<int>(valueForLength(length, LayoutUnit(maximumValue))); 34 return valueForLength(length, LayoutUnit(maximumValue)).toInt();
35 } 35 }
36 36
37 float floatValueForLength(const Length& length, float maximumValue) 37 float floatValueForLength(const Length& length, float maximumValue)
38 { 38 {
39 switch (length.type()) { 39 switch (length.type()) {
40 case Fixed: 40 case Fixed:
41 return length.getFloatValue(); 41 return length.getFloatValue();
42 case Percent: 42 case Percent:
43 return static_cast<float>(maximumValue * length.percent() / 100.0f); 43 return static_cast<float>(maximumValue * length.percent() / 100.0f);
44 case FillAvailable: 44 case FillAvailable:
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 { 122 {
123 return FloatSize(floatValueForLength(lengthSize.width(), boxSize.width()), f loatValueForLength(lengthSize.height(), boxSize.height())); 123 return FloatSize(floatValueForLength(lengthSize.width(), boxSize.width()), f loatValueForLength(lengthSize.height(), boxSize.height()));
124 } 124 }
125 125
126 FloatPoint floatPointForLengthPoint(const LengthPoint& LengthPoint, const FloatS ize& boxSize) 126 FloatPoint floatPointForLengthPoint(const LengthPoint& LengthPoint, const FloatS ize& boxSize)
127 { 127 {
128 return FloatPoint(floatValueForLength(LengthPoint.x(), boxSize.width()), flo atValueForLength(LengthPoint.y(), boxSize.height())); 128 return FloatPoint(floatValueForLength(LengthPoint.x(), boxSize.width()), flo atValueForLength(LengthPoint.y(), boxSize.height()));
129 } 129 }
130 130
131 } // namespace blink 131 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/LayoutUnit.h ('k') | third_party/WebKit/Source/platform/geometry/IntRect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698