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

Unified Diff: Source/core/rendering/style/ShadowList.cpp

Issue 479563002: Remove additionalOutlineSize in ShadowList: it is always 0. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/ShadowList.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/ShadowList.cpp
diff --git a/Source/core/rendering/style/ShadowList.cpp b/Source/core/rendering/style/ShadowList.cpp
index ccd773a14bff59d92ea70c70d26fb87d2428ecb2..d997e99cc6fe0cd69c1e7e628198388516fb8c5c 100644
--- a/Source/core/rendering/style/ShadowList.cpp
+++ b/Source/core/rendering/style/ShadowList.cpp
@@ -36,7 +36,7 @@
namespace blink {
-static inline void calculateShadowExtent(const ShadowList* shadowList, float additionalOutlineSize, float& shadowLeft, float& shadowRight, float& shadowTop, float& shadowBottom)
+static inline void calculateShadowExtent(const ShadowList* shadowList, float& shadowLeft, float& shadowRight, float& shadowTop, float& shadowBottom)
{
ASSERT(shadowList);
size_t shadowCount = shadowList->shadows().size();
@@ -44,7 +44,7 @@ static inline void calculateShadowExtent(const ShadowList* shadowList, float add
const ShadowData& shadow = shadowList->shadows()[i];
if (shadow.style() == Inset)
continue;
- float blurAndSpread = shadow.blur() + shadow.spread() + additionalOutlineSize;
+ float blurAndSpread = shadow.blur() + shadow.spread();
shadowLeft = std::min(shadow.x() - blurAndSpread, shadowLeft);
shadowRight = std::max(shadow.x() + blurAndSpread, shadowRight);
shadowTop = std::min(shadow.y() - blurAndSpread, shadowTop);
@@ -52,20 +52,20 @@ static inline void calculateShadowExtent(const ShadowList* shadowList, float add
}
}
-void ShadowList::adjustRectForShadow(LayoutRect& rect, float additionalOutlineSize) const
+void ShadowList::adjustRectForShadow(LayoutRect& rect) const
{
FloatRect floatRect(rect);
adjustRectForShadow(floatRect);
rect = LayoutRect(floatRect);
}
-void ShadowList::adjustRectForShadow(FloatRect& rect, float additionalOutlineSize) const
+void ShadowList::adjustRectForShadow(FloatRect& rect) const
{
float shadowLeft = 0;
float shadowRight = 0;
float shadowTop = 0;
float shadowBottom = 0;
- calculateShadowExtent(this, additionalOutlineSize, shadowLeft, shadowRight, shadowTop, shadowBottom);
+ calculateShadowExtent(this, shadowLeft, shadowRight, shadowTop, shadowBottom);
rect.move(shadowLeft, shadowTop);
rect.setWidth(rect.width() - shadowLeft + shadowRight);
« no previous file with comments | « Source/core/rendering/style/ShadowList.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698