nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Merge mozilla-central to autoland. CLOSED TREE

Browse source
This commit is contained in:
Bogdan Szekely 2022-05-17 12:29:28 +03:00
commit 1e42da6d61
3 changed files with 3 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/locales/l10n-changesets.json
View file

@ -951,7 +951,7 @@
"win64-aarch64-devedition", "win64-aarch64-devedition",
"win64-devedition" "win64-devedition"
], ],
"revision": "cbaab53a0ccfa0d0accb2404a4c271b4f4c331da" "revision": "981dc08543d2aa49aad8a0a8f9bbc180af1fb413"
}, },
"ja": { "ja": {
"pin": false, "pin": false,

3
editor/libeditor/HTMLEditor.cpp
View file

@ -197,8 +197,7 @@ HTMLEditor::HTMLEditor()
mDefaultParagraphSeparator( mDefaultParagraphSeparator(
StaticPrefs::editor_use_div_for_default_newlines() StaticPrefs::editor_use_div_for_default_newlines()
? ParagraphSeparator::div ? ParagraphSeparator::div
: ParagraphSeparator::br) { : ParagraphSeparator::br) {}
}
HTMLEditor::~HTMLEditor() { HTMLEditor::~HTMLEditor() {
// Collect the data of `beforeinput` event only when it's enabled because // Collect the data of `beforeinput` event only when it's enabled because

3
layout/generic/nsIFrame.cpp
View file

@ -3442,8 +3442,7 @@ void nsIFrame::BuildDisplayListForStackingContext(
// to remove any existing content that isn't wrapped in the blend container, // to remove any existing content that isn't wrapped in the blend container,
// and then we need to build content infront/behind the blend container // and then we need to build content infront/behind the blend container
// to get correct positioning during merging. // to get correct positioning during merging.
if ((aBuilder->ContainsBlendMode()) && if ((aBuilder->ContainsBlendMode()) && aBuilder->IsRetainingDisplayList()) {
aBuilder->IsRetainingDisplayList()) {
if (aBuilder->IsPartialUpdate()) { if (aBuilder->IsPartialUpdate()) {
aBuilder->SetPartialBuildFailed(true); aBuilder->SetPartialBuildFailed(true);
} else { } else {