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

Unified Diff: Source/core/rendering/shapes/RasterShape.cpp

Issue 318443004: Fix off by one in creating a RasterShape (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update for review feedback Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-shape-margin-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/shapes/RasterShape.cpp
diff --git a/Source/core/rendering/shapes/RasterShape.cpp b/Source/core/rendering/shapes/RasterShape.cpp
index be9d2eab07574a31f4f6a269e83aa0db91f34b40..8dda343bc6698bebad5b68b6c069cb3c00ef7db5 100644
--- a/Source/core/rendering/shapes/RasterShape.cpp
+++ b/Source/core/rendering/shapes/RasterShape.cpp
@@ -86,7 +86,7 @@ PassOwnPtr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginInterva
marginIntervalGenerator.set(y, intervalAtY);
int marginY0 = std::max(minY(), y - shapeMargin);
- int marginY1 = std::min(maxY(), y + shapeMargin);
+ int marginY1 = std::min(maxY(), y + shapeMargin + 1);
for (int marginY = y - 1; marginY >= marginY0; --marginY) {
if (marginY > bounds().y() && intervalAt(marginY).contains(intervalAtY))
@@ -96,7 +96,7 @@ PassOwnPtr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginInterva
result->intervalAt(y).unite(marginIntervalGenerator.intervalAt(y));
- for (int marginY = y + 1; marginY <= marginY1; ++marginY) {
+ for (int marginY = y + 1; marginY < marginY1; ++marginY) {
if (marginY < bounds().maxY() && intervalAt(marginY).contains(intervalAtY))
break;
result->intervalAt(marginY).unite(marginIntervalGenerator.intervalAt(marginY));
« no previous file with comments | « LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-shape-margin-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698