Merge mozilla-central to autoland. CLOSED TREE

This commit is contained in:
Butkovits Atila 2022-01-27 23:48:39 +02:00
Родитель 50ff6071f3 7056a70878
Коммит d6911a4e30
2 изменённых файлов: 24 добавлений и 25 удалений

Просмотреть файл

@ -357,7 +357,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "d9001caadec33266ec086cfd52b6209551e456af"
"revision": "d8f6222425ba68244150bfbc6681afbfb2ffe5fd"
},
"de": {
"pin": false,
@ -393,7 +393,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "611248df8f629860d012cbc8f3a36acfd8744b46"
"revision": "70960aa71596ad656e55cc1e49d84948e543f929"
},
"el": {
"pin": false,
@ -411,7 +411,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "c6a43da21535fec752b680a87f0463514f4e8166"
"revision": "4967d37f3abcff1ac87c3ec8030d857d828eef19"
},
"en-CA": {
"pin": false,
@ -483,7 +483,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "f1d2b95d044c6bf81d2b7cf06bd3fd465a5b52ac"
"revision": "26e4da761e45a9dbf07a154075879ef07a3272f8"
},
"es-CL": {
"pin": false,
@ -537,7 +537,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "6c2f8a3e9499bbd56c4d480c9ce7dd2a75381ae3"
"revision": "566ff2d1a95ec079055485dd014df526e60c066f"
},
"et": {
"pin": false,
@ -645,7 +645,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "ce1d665cec91d4d29160860dba2350f22f2f4df7"
"revision": "b962d49d4e7a7bd263396212689465fac28a8336"
},
"fy-NL": {
"pin": false,
@ -663,7 +663,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "104ef9b7199645cb95e79704a357da3873609102"
"revision": "9888ad5e805705a56ac037744c35542522d844c5"
},
"ga-IE": {
"pin": false,
@ -771,7 +771,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "3385ae23e3b569ba9c0c1aca4df25277b81a108e"
"revision": "a1178626bd760ac054bd0fccf1b515cc22075642"
},
"hi-IN": {
"pin": false,
@ -825,7 +825,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "f137d0e6746dc23beff4745474df87c33fae353b"
"revision": "b104392a7274e2a74942c7793d0cdce02ca4ef1d"
},
"hu": {
"pin": false,
@ -843,7 +843,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "3c9109c2213555fd1ae5d4b014d513d993414848"
"revision": "08ce6fff597386be51098c9d5f2ed33716277216"
},
"hy-AM": {
"pin": false,
@ -879,7 +879,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "2f5589c9acf82d485dffbef85540ab5d05c44d41"
"revision": "29bd8d27e31483c53678a41b6ee4a075db3247ab"
},
"ia": {
"pin": false,
@ -897,7 +897,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "32d695d33e1cdad0ca7027d927298eb43c4bdc9d"
"revision": "b28bd64f2bead3c132b3f7aeb0f52736c21902a1"
},
"id": {
"pin": false,
@ -951,7 +951,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "e6b8ee61e0af59c501cab7302b3ba98fdd175837"
"revision": "2167505171c54ac5cc220a27b15e9e667f789230"
},
"ja": {
"pin": false,
@ -993,7 +993,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "8ac921d9ae29c79b668448aab561f79a2439abfb"
"revision": "df40a9c16493e88634fda6505355f0675567e223"
},
"kab": {
"pin": false,
@ -1029,7 +1029,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "f2efb1bc6f7ff55f76c76672ffd11b6e90f026ca"
"revision": "f34ffb08787eb336151f6218a295c218cb6f49e2"
},
"km": {
"pin": false,
@ -1083,7 +1083,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "16c1dddf3d342c2fec2ed8a2f23c4c25eb9df8ba"
"revision": "6ec9bfa5beae85de78b5866062bde22cd6127f0a"
},
"lij": {
"pin": false,
@ -1317,7 +1317,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "54e27a8516f94745f766e70b653fb2ae81b4b1d6"
"revision": "d0646a90b2ebc7801d3f2d3c78f26bcc3ecd75f0"
},
"nn-NO": {
"pin": false,
@ -1335,7 +1335,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "4260063f4c62c33c7e769c4f870002caf401d56d"
"revision": "e00a95de1a8deeda1a33a8fb6b77f40d50cea15f"
},
"oc": {
"pin": false,
@ -1407,7 +1407,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "f82347c797d6e3cec92f36aad57aaf7b79a6570a"
"revision": "f348ba8ca384b9d8180e96b85ddd53b4c45dfe9a"
},
"pt-PT": {
"pin": false,
@ -1677,7 +1677,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "fbeae2bbc5837470c90793f92a1cc90b7d6fd51f"
"revision": "1724795ef994f75dbe7925425e946826ced6bf44"
},
"szl": {
"pin": false,
@ -1839,7 +1839,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "49c420df23c539b6c8c9d9bc5f51fa0788141157"
"revision": "fb035cf3976d88d45757a880c4c2a82eb51ad8c5"
},
"ur": {
"pin": false,
@ -1893,7 +1893,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "e24285029832c0cc588e8e12aa2212dff982d623"
"revision": "64d031b6151861fabe6bee632d6bdf33a61dc8d9"
},
"wo": {
"pin": false,
@ -1965,6 +1965,6 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "f86c570fdc59c21666014d9c81f61c9ebeac0d72"
"revision": "e9584ed8dad7eb1397e7bdffdb863a8f0a95d3cb"
}
}

Просмотреть файл

@ -1854,8 +1854,7 @@ nsresult AutoScroller::DoAutoScroll(nsIFrame* aFrame, nsPoint aPoint) {
// Start the AutoScroll timer if necessary.
// `ScrollFrameRectIntoView` above may have run script and this may have
// forbidden to continue scrolling.
if (didScroll &&
mFurtherScrollingAllowed == FurtherScrollingAllowed::kYes) {
if (didScroll && mFurtherScrollingAllowed == FurtherScrollingAllowed::kYes) {
nsPoint presContextPoint =
globalPoint -
presShell->GetRootFrame()->GetOffsetToCrossDoc(rootmostFrame);