| Index: Source/core/rendering/style/ShadowList.cpp
|
| diff --git a/Source/core/rendering/style/ShadowList.cpp b/Source/core/rendering/style/ShadowList.cpp
|
| index 675effec90bcd16241bfcfb6b90478343ebb3a90..a9a861dfa06e1d5f3d8181ac43a2dfe4c588961e 100644
|
| --- a/Source/core/rendering/style/ShadowList.cpp
|
| +++ b/Source/core/rendering/style/ShadowList.cpp
|
| @@ -36,7 +36,7 @@
|
|
|
| namespace WebCore {
|
|
|
| -static inline void calculateShadowExtent(const ShadowList* shadowList, int additionalOutlineSize, int& shadowLeft, int& shadowRight, int& shadowTop, int& shadowBottom)
|
| +static inline void calculateShadowExtent(const ShadowList* shadowList, LayoutUnit additionalOutlineSize, LayoutUnit& shadowLeft, LayoutUnit& shadowRight, LayoutUnit& shadowTop, LayoutUnit& shadowBottom)
|
| {
|
| ASSERT(shadowList);
|
| size_t shadowCount = shadowList->shadows().size();
|
| @@ -44,7 +44,7 @@ static inline void calculateShadowExtent(const ShadowList* shadowList, int addit
|
| const ShadowData& shadow = shadowList->shadows()[i];
|
| if (shadow.style() == Inset)
|
| continue;
|
| - int blurAndSpread = shadow.blur() + shadow.spread() + additionalOutlineSize;
|
| + LayoutUnit blurAndSpread = shadow.blur() + shadow.spread() + additionalOutlineSize;
|
| shadowLeft = std::min(shadow.x() - blurAndSpread, shadowLeft);
|
| shadowRight = std::max(shadow.x() + blurAndSpread, shadowRight);
|
| shadowTop = std::min(shadow.y() - blurAndSpread, shadowTop);
|
| @@ -52,12 +52,12 @@ static inline void calculateShadowExtent(const ShadowList* shadowList, int addit
|
| }
|
| }
|
|
|
| -void ShadowList::adjustRectForShadow(LayoutRect& rect, int additionalOutlineSize) const
|
| +void ShadowList::adjustRectForShadow(LayoutRect& rect, LayoutUnit additionalOutlineSize) const
|
| {
|
| - int shadowLeft = 0;
|
| - int shadowRight = 0;
|
| - int shadowTop = 0;
|
| - int shadowBottom = 0;
|
| + LayoutUnit shadowLeft = 0;
|
| + LayoutUnit shadowRight = 0;
|
| + LayoutUnit shadowTop = 0;
|
| + LayoutUnit shadowBottom = 0;
|
| calculateShadowExtent(this, additionalOutlineSize, shadowLeft, shadowRight, shadowTop, shadowBottom);
|
|
|
| rect.move(shadowLeft, shadowTop);
|
| @@ -65,12 +65,12 @@ void ShadowList::adjustRectForShadow(LayoutRect& rect, int additionalOutlineSize
|
| rect.setHeight(rect.height() - shadowTop + shadowBottom);
|
| }
|
|
|
| -void ShadowList::adjustRectForShadow(FloatRect& rect, int additionalOutlineSize) const
|
| +void ShadowList::adjustRectForShadow(FloatRect& rect, LayoutUnit additionalOutlineSize) const
|
| {
|
| - int shadowLeft = 0;
|
| - int shadowRight = 0;
|
| - int shadowTop = 0;
|
| - int shadowBottom = 0;
|
| + LayoutUnit shadowLeft = 0;
|
| + LayoutUnit shadowRight = 0;
|
| + LayoutUnit shadowTop = 0;
|
| + LayoutUnit shadowBottom = 0;
|
| calculateShadowExtent(this, additionalOutlineSize, shadowLeft, shadowRight, shadowTop, shadowBottom);
|
|
|
| rect.move(shadowLeft, shadowTop);
|
| @@ -87,8 +87,8 @@ PassRefPtr<ShadowList> ShadowList::blend(const ShadowList* from, const ShadowLis
|
|
|
| ShadowDataVector shadows;
|
|
|
| - DEFINE_STATIC_LOCAL(ShadowData, defaultShadowData, (IntPoint(), 0, 0, Normal, Color::transparent));
|
| - DEFINE_STATIC_LOCAL(ShadowData, defaultInsetShadowData, (IntPoint(), 0, 0, Inset, Color::transparent));
|
| + DEFINE_STATIC_LOCAL(ShadowData, defaultShadowData, (LayoutPoint(), 0, 0, Normal, Color::transparent));
|
| + DEFINE_STATIC_LOCAL(ShadowData, defaultInsetShadowData, (LayoutPoint(), 0, 0, Inset, Color::transparent));
|
|
|
| size_t maxLength = std::max(fromLength, toLength);
|
| for (size_t i = 0; i < maxLength; ++i) {
|
|
|