Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1464113 Part 1: Make ImageShapeInfo tolerate shapes that are shifted left or above their margin rects. r=dholbert

Browse Source 
MozReview-Commit-ID: 9NuHsjQfLxP

--HG--
extra : rebase_source : 37c7524daa268bb8321b9904ead9ca643f0641db
This commit is contained in:
Brad Werth 2018-05-25 15:12:02 -07:00
parent 571854a7c1
commit e0834100e1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsFloatManager.cpp
View File

@ -1930,9 +1930,6 @@ nsFloatManager::ImageShapeInfo::ImageShapeInfo(
// we calculate a dfOffset value which is the top left of the content
// rect relative to the margin rect.
nsPoint offsetPoint = aContentRect.TopLeft() - aMarginRect.TopLeft();
MOZ_ASSERT(offsetPoint.x >= 0 && offsetPoint.y >= 0,
"aContentRect should be within aMarginRect, which we need "
"for our math to make sense.");
LayoutDeviceIntPoint dfOffset =
LayoutDevicePixel::FromAppUnitsRounded(offsetPoint,
aAppUnitsPerDevPixel);
@ -2014,10 +2011,10 @@ nsFloatManager::ImageShapeInfo::ImageShapeInfo(
row >= hEx - kExpansionPerSide) {
// Case 1: Expanded pixel.
df[index] = MAX_MARGIN_5X;
} else if (col >= (uint32_t)dfOffset.x &&
col < (uint32_t)(dfOffset.x + w) &&
row >= (uint32_t)dfOffset.y &&
row < (uint32_t)(dfOffset.y + h) &&
} else if ((int32_t)col >= dfOffset.x &&
(int32_t)col < (dfOffset.x + aImageSize.width) &&
(int32_t)row >= dfOffset.y &&
(int32_t)row < (dfOffset.y + aImageSize.height) &&
aAlphaPixels[col - dfOffset.x +
(row - dfOffset.y) * aStride] > threshold) {
// Case 2: Image pixel that is opaque.