author | Botond Ballo <botond@mozilla.com> |
Sun, 24 Jan 2021 04:08:00 +0000 | |
changeset 564410 | e65982f456435928e5ed52db9a96d12836663e7a |
parent 564409 | 3837805e531398c01dcc75d0ff93fafe792b8c96 |
child 564411 | ff31d767beaac803ae4f238a86dcc66bc668bb8e |
push id | 134841 |
push user | bballo@mozilla.com |
push date | Sun, 24 Jan 2021 04:10:33 +0000 |
treeherder | autoland@e65982f45643 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | tnikkel |
bugs | 1682919 |
milestone | 86.0a1 |
first release with | nightly linux32
e65982f45643
/
86.0a1
/
20210124091450
/
files
nightly linux64
e65982f45643
/
86.0a1
/
20210124091450
/
files
nightly mac
e65982f45643
/
86.0a1
/
20210124091450
/
files
nightly win32
e65982f45643
/
86.0a1
/
20210124091450
/
files
nightly win64
e65982f45643
/
86.0a1
/
20210124091450
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
86.0a1
/
20210124091450
/
pushlog to previous
nightly linux64
86.0a1
/
20210124091450
/
pushlog to previous
nightly mac
86.0a1
/
20210124091450
/
pushlog to previous
nightly win32
86.0a1
/
20210124091450
/
pushlog to previous
nightly win64
86.0a1
/
20210124091450
/
pushlog to previous
|
--- a/layout/base/DisplayPortUtils.cpp +++ b/layout/base/DisplayPortUtils.cpp @@ -546,19 +546,23 @@ static bool GetDisplayPortImpl(nsIConten isDisplayportSuppressed = presShell->IsDisplayportSuppressed(); } nsRect result; if (rectData) { result = GetDisplayPortFromRectData(aContent, rectData, aMultiplier); } else if (isDisplayportSuppressed || nsLayoutUtils::ShouldDisableApzForElement(aContent)) { - DisplayPortMarginsPropertyData noMargins( - DisplayPortMargins::Empty(aContent), 1, - /*painted=*/false); + // Make a copy of the margins data but set the margins to empty. + // Do not create a new DisplayPortMargins object with + // DisplayPortMargins::Empty(), because that will record the visual + // and layout scroll offsets in place right now on the DisplayPortMargins, + // and those are only meant to be recorded when the margins are stored. + DisplayPortMarginsPropertyData noMargins = *marginsData; + noMargins.mMargins.mMargins = ScreenMargin(); result = GetDisplayPortFromMarginsData(aContent, &noMargins, aMultiplier, aOptions); } else { result = GetDisplayPortFromMarginsData(aContent, marginsData, aMultiplier, aOptions); } if (!StaticPrefs::layers_enable_tiles_AtStartup()) {