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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 1447273003: Make the FloatSize constructor from an IntSize explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 } 1019 }
1020 1020
1021 void ComputedStyle::setBoxShadow(PassRefPtr<ShadowList> s) 1021 void ComputedStyle::setBoxShadow(PassRefPtr<ShadowList> s)
1022 { 1022 {
1023 rareNonInheritedData.access()->m_boxShadow = s; 1023 rareNonInheritedData.access()->m_boxShadow = s;
1024 } 1024 }
1025 1025
1026 static FloatRoundedRect::Radii calcRadiiFor(const BorderData& border, LayoutSize size) 1026 static FloatRoundedRect::Radii calcRadiiFor(const BorderData& border, LayoutSize size)
1027 { 1027 {
1028 return FloatRoundedRect::Radii( 1028 return FloatRoundedRect::Radii(
1029 IntSize(valueForLength(border.topLeft().width(), size.width()), 1029 FloatSize(floatValueForLength(border.topLeft().width(), size.width().toF loat()),
1030 valueForLength(border.topLeft().height(), size.height())), 1030 floatValueForLength(border.topLeft().height(), size.height().toFloat ())),
1031 IntSize(valueForLength(border.topRight().width(), size.width()), 1031 FloatSize(floatValueForLength(border.topRight().width(), size.width().to Float()),
1032 valueForLength(border.topRight().height(), size.height())), 1032 floatValueForLength(border.topRight().height(), size.height().toFloa t())),
1033 IntSize(valueForLength(border.bottomLeft().width(), size.width()), 1033 FloatSize(floatValueForLength(border.bottomLeft().width(), size.width(). toFloat()),
1034 valueForLength(border.bottomLeft().height(), size.height())), 1034 floatValueForLength(border.bottomLeft().height(), size.height().toFl oat())),
1035 IntSize(valueForLength(border.bottomRight().width(), size.width()), 1035 FloatSize(floatValueForLength(border.bottomRight().width(), size.width() .toFloat()),
1036 valueForLength(border.bottomRight().height(), size.height()))); 1036 floatValueForLength(border.bottomRight().height(), size.height().toF loat())));
1037 } 1037 }
1038 1038
1039 StyleImage* ComputedStyle::listStyleImage() const { return rareInheritedData->li stStyleImage.get(); } 1039 StyleImage* ComputedStyle::listStyleImage() const { return rareInheritedData->li stStyleImage.get(); }
1040 void ComputedStyle::setListStyleImage(PassRefPtrWillBeRawPtr<StyleImage> v) 1040 void ComputedStyle::setListStyleImage(PassRefPtrWillBeRawPtr<StyleImage> v)
1041 { 1041 {
1042 if (rareInheritedData->listStyleImage != v) 1042 if (rareInheritedData->listStyleImage != v)
1043 rareInheritedData.access()->listStyleImage = v; 1043 rareInheritedData.access()->listStyleImage = v;
1044 } 1044 }
1045 1045
1046 Color ComputedStyle::color() const { return inherited->color; } 1046 Color ComputedStyle::color() const { return inherited->color; }
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 } 1827 }
1828 1828
1829 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1829 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1830 { 1830 {
1831 setEmptyState(other.emptyState()); 1831 setEmptyState(other.emptyState());
1832 if (other.hasExplicitlyInheritedProperties()) 1832 if (other.hasExplicitlyInheritedProperties())
1833 setHasExplicitlyInheritedProperties(); 1833 setHasExplicitlyInheritedProperties();
1834 } 1834 }
1835 1835
1836 } // namespace blink 1836 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/ThemePainterMac.mm ('k') | third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698