зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1460041 Part 1: Correct PolygonShapeInfo constructor to measure its start and end block extents in margin rect space. r=jfkthame
MozReview-Commit-ID: 5pxiK1oH7sn --HG-- extra : rebase_source : f6ad9f0e66a0ce5fe7c487a0cd9a05e74bbd201f
This commit is contained in:
Родитель
0cc1c8ec9b
Коммит
140f9cb9f9
|
@ -1409,8 +1409,6 @@ nsFloatManager::PolygonShapeInfo::PolygonShapeInfo(
|
||||||
nscoord bInAppUnits = (b - kbExpansionPerSide) * aAppUnitsPerDevPixel;
|
nscoord bInAppUnits = (b - kbExpansionPerSide) * aAppUnitsPerDevPixel;
|
||||||
bool bIsInExpandedRegion(b < kbExpansionPerSide ||
|
bool bIsInExpandedRegion(b < kbExpansionPerSide ||
|
||||||
b >= bSize - kbExpansionPerSide);
|
b >= bSize - kbExpansionPerSide);
|
||||||
bool bIsLessThanPolygonBStart(bInAppUnits < mBStart);
|
|
||||||
bool bIsMoreThanPolygonBEnd(bInAppUnits >= mBEnd);
|
|
||||||
|
|
||||||
// We now figure out the i values that correspond to the left edge and
|
// We now figure out the i values that correspond to the left edge and
|
||||||
// the right edge of the polygon at one-dev-pixel-thick strip of b. We
|
// the right edge of the polygon at one-dev-pixel-thick strip of b. We
|
||||||
|
@ -1420,6 +1418,8 @@ nsFloatManager::PolygonShapeInfo::PolygonShapeInfo(
|
||||||
// get out, we have to subtract away the aMarginRect.x value before
|
// get out, we have to subtract away the aMarginRect.x value before
|
||||||
// converting the app units to dev pixels.
|
// converting the app units to dev pixels.
|
||||||
nscoord bInAppUnitsMarginRect = bInAppUnits + aMarginRect.y;
|
nscoord bInAppUnitsMarginRect = bInAppUnits + aMarginRect.y;
|
||||||
|
bool bIsLessThanPolygonBStart(bInAppUnitsMarginRect < mBStart);
|
||||||
|
bool bIsMoreThanPolygonBEnd(bInAppUnitsMarginRect >= mBEnd);
|
||||||
|
|
||||||
const int32_t iLeftEdge = (bIsInExpandedRegion ||
|
const int32_t iLeftEdge = (bIsInExpandedRegion ||
|
||||||
bIsLessThanPolygonBStart ||
|
bIsLessThanPolygonBStart ||
|
||||||
|
|
Загрузка…
Ссылка в новой задаче