mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge inbound to mozilla-central a=merge

This commit is contained in:
arthur.iakab 2019-04-04 19:08:32 +03:00
Родитель 430d249d93 23d62cdafd
Коммит b0bf8d987a
6 изменённых файлов: 35 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
dom/xbl/nsXBLService.cpp
Просмотреть файл

@ -496,6 +496,8 @@ nsresult nsXBLService::LoadBindings(Element* aElement, nsIURI* aURL,
return rv;
}
AutoStyleElement styleElement(aElement, aResolveStyle);
if (binding) {
FlushStyleBindings(aElement);
binding = nullptr;
@ -525,8 +527,6 @@ nsresult nsXBLService::LoadBindings(Element* aElement, nsIURI* aURL,
return NS_ERROR_ILLEGAL_VALUE;
}
AutoStyleElement styleElement(aElement, aResolveStyle);
// We loaded a style binding. It goes on the end.
// Install the binding on the content node.
aElement->SetXBLBinding(newBinding);

37
layout/base/tests/test_bug114649.html
Просмотреть файл

@ -20,19 +20,20 @@ var gIFrame;
var gCurrentWidth = 500;
var gGotEventsAt = [];
var gInterval;
var gFinished = false;
function run() {
SimpleTest.waitForExplicitFinish();
SimpleTest.requestFlakyTimeout("untriaged");
SimpleTest.requestFlakyTimeout("Simulating dragging to resize a window");
gIFrame = document.getElementById("display");
var subdoc = gIFrame.contentDocument;
subdoc.open();
subdoc.write("<body onresize='window.parent.handle_child_resize()'>");
subdoc.write("<body onresize='window.parent.handle_resize_event()'>");
subdoc.close();
gInterval = window.setInterval(do_a_resize, 50);
setTimeout(do_a_resize, 50);
}
function do_a_resize()
@ -41,24 +42,34 @@ function do_a_resize()
gCurrentWidth -= 10;
gIFrame.style.width = gCurrentWidth + "px";
if (gCurrentWidth == 400) {
window.clearInterval(gInterval);
window.setTimeout(check_for_resize_events, 250);
return;
if (gCurrentWidth > 400) {
setTimeout(do_a_resize, 50);
}
}
function handle_child_resize()
function handle_resize_event()
{
gGotEventsAt.push(gCurrentWidth);
if (gCurrentWidth == 400) {
check_resize_events();
}
}
function check_for_resize_events()
function check_resize_events()
{
ok(gGotEventsAt.length >= 2, "got continuous events");
isnot(gGotEventsAt[0], 400, "got continuous events");
is(gGotEventsAt[gGotEventsAt.length - 1], 400, "got last event");
SimpleTest.finish();
if (gFinished) {
// We can get here when the browser can't process the resizes and
// dispatch resize events as fast as we're doing the resizing. We can
// then end up with multiple resize events queued up after we set our
// final size. This return makes sure that in that case we avoid
// calling SimpleTest.finish() more than once.
return;
}
gFinished = true;
ok(gGotEventsAt.length >= 2, "We should get more than one event");
isnot(gGotEventsAt[0], 400, "The first event shouldn't be for the final size");
SimpleTest.finish();
}
</script>

3
modules/libpref/init/all.js
Просмотреть файл

@ -3205,7 +3205,8 @@ pref("layout.display-list.dump-parent", false);
pref("layout.display-list.retain", true);
pref("layout.display-list.retain.chrome", false);
#else
pref("layout.display-list.retain", false);
pref("layout.display-list.retain", true);
pref("layout.display-list.retain.chrome", true);
#endif
// Set the maximum amount of modified frames allowed before doing a full

3
testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-012.xht.ini Normal file
Просмотреть файл

@ -0,0 +1,3 @@
[background-attachment-applies-to-012.xht]
expected:
if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

3
testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-014.xht.ini Normal file
Просмотреть файл

@ -0,0 +1,3 @@
[background-attachment-applies-to-014.xht]
expected:
if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

1
testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
Просмотреть файл

@ -4,3 +4,4 @@
if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL