Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1413618 - Avoid possible division by zero. r=xidorn

Browse Source 
MozReview-Commit-ID: JSTvMb3mM4P

--HG--
extra : rebase_source : 646429f399c47efef56ee9ae4e3b3bed410a9864
This commit is contained in:
Kartikaya Gupta 2018-01-08 05:59:08 -05:00
parent 5acf65c7fe
commit c6e614c39a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsLayoutUtils.cpp
View File

@ -1099,7 +1099,10 @@ GetDisplayPortFromMarginsData(nsIContent* aContent,
int32_t budget = maxHeightScreenPx - screenRect.height;
// Scale the margins down to fit into the budget if necessary, maintaining
// their relative ratio.
float scale = std::min(1.0f, float(budget) / margins.TopBottom());
float scale = 1.0f;
if (float(budget) < margins.TopBottom()) {
scale = float(budget) / margins.TopBottom();
}
float top = margins.top * scale;
float bottom = margins.bottom * scale;
screenRect.y -= top;
@ -1107,7 +1110,10 @@ GetDisplayPortFromMarginsData(nsIContent* aContent,
}
if (screenRect.width < maxWidthScreenPx) {
int32_t budget = maxWidthScreenPx - screenRect.width;
float scale = std::min(1.0f, float(budget) / margins.LeftRight());
float scale = 1.0f;
if (float(budget) < margins.LeftRight()) {
scale = float(budget) / margins.LeftRight();
}
float left = margins.left * scale;
float right = margins.right * scale;
screenRect.x -= left;