summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
Diffstat (limited to 'layout')
-rw-r--r--layout/generic/test/file_bug514732_window.xhtml17
-rw-r--r--layout/reftests/css-grid/grid-repeat-auto-fill-fit-001-ref.html2
-rw-r--r--layout/reftests/css-grid/grid-repeat-auto-fill-fit-001.html2
-rw-r--r--layout/reftests/css-grid/grid-repeat-auto-fill-fit-010-ref.html2
-rw-r--r--layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html2
-rw-r--r--layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html2
-rw-r--r--layout/style/FontFaceImpl.cpp8
-rw-r--r--layout/tables/nsTableCellFrame.cpp6
8 files changed, 30 insertions, 11 deletions
diff --git a/layout/generic/test/file_bug514732_window.xhtml b/layout/generic/test/file_bug514732_window.xhtml
index 094ff9ab23..5d7342776f 100644
--- a/layout/generic/test/file_bug514732_window.xhtml
+++ b/layout/generic/test/file_bug514732_window.xhtml
@@ -5,7 +5,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
width="600"
height="600"
- onload="setTimeout(nextTest,0);"
+ onload="setTimeout(startTests,0);"
title="bug 514732 test">
<script type="application/javascript"><![CDATA[
@@ -75,7 +75,20 @@
finish();
}
-
+
+ function startTests() {
+ // Flush layout in outer and inner documents (in that order), to be sure
+ // our TestWindow's initial about:blank document doesn't have any
+ // pending reflows. (If we leave these pending reflows un-flushed, then
+ // they might happen after we've set up our MozScrolledAreaChanged
+ // event-listener; and that would confuse our test logic and lead to
+ // timeouts and test-failures.)
+ document.documentElement.offsetHeight;
+ TestWindow.getDocument().documentElement.offsetHeight;
+
+ // Kick off the first test via the generator-iterator.
+ nextTest();
+ }
]]></script>
<browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
diff --git a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001-ref.html b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001-ref.html
index e650af263a..422ae78679 100644
--- a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001-ref.html
+++ b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001-ref.html
@@ -10,6 +10,8 @@
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
+ /* We use overflow:hidden on root scroller to work around bug 1873749: */
+ overflow: hidden;
}
.grid {
diff --git a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001.html b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001.html
index 93af88ed73..511a435b82 100644
--- a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001.html
+++ b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-001.html
@@ -12,6 +12,8 @@
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
+ /* We use overflow:hidden on root scroller to work around bug 1873749: */
+ overflow: hidden;
}
.grid {
diff --git a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010-ref.html b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010-ref.html
index 5da5488943..17883c81c0 100644
--- a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010-ref.html
+++ b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010-ref.html
@@ -10,6 +10,8 @@
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
+ /* We use overflow:hidden on root scroller to work around bug 1873749: */
+ overflow: hidden;
}
.grid {
diff --git a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html
index 7c923e65cf..0f8c0d510b 100644
--- a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html
+++ b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html
@@ -12,6 +12,8 @@
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
+ /* We use overflow:hidden on root scroller to work around bug 1873749: */
+ overflow: hidden;
}
.grid {
diff --git a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html
index 4a39831f29..998dfe3693 100644
--- a/layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html
+++ b/layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html
@@ -12,6 +12,8 @@
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
+ /* We use overflow:hidden on root scroller to work around bug 1873749: */
+ overflow: hidden;
}
.grid {
diff --git a/layout/style/FontFaceImpl.cpp b/layout/style/FontFaceImpl.cpp
index cb25bec954..30f16e4be8 100644
--- a/layout/style/FontFaceImpl.cpp
+++ b/layout/style/FontFaceImpl.cpp
@@ -351,14 +351,6 @@ void FontFaceImpl::DoLoad() {
if (!CreateUserFontEntry()) {
return;
}
-
- if (!NS_IsMainThread()) {
- NS_DispatchToMainThread(NS_NewRunnableFunction(
- "FontFaceImpl::DoLoad",
- [entry = RefPtr{mUserFontEntry}]() { entry->Load(); }));
- return;
- }
-
mUserFontEntry->Load();
}
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 6ebe9c1daf..72d2b2943e 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -169,7 +169,11 @@ nsresult nsTableCellFrame::AttributeChanged(int32_t aNameSpaceID,
NS_FRAME_IS_DIRTY);
}
- if (aAttribute == nsGkAtoms::rowspan || aAttribute == nsGkAtoms::colspan) {
+ const nsAtom* colSpanAttribute =
+ MOZ_UNLIKELY(mContent->AsElement()->IsMathMLElement())
+ ? nsGkAtoms::columnspan_
+ : nsGkAtoms::colspan;
+ if (aAttribute == nsGkAtoms::rowspan || aAttribute == colSpanAttribute) {
nsLayoutUtils::PostRestyleEvent(mContent->AsElement(), RestyleHint{0},
nsChangeHint_UpdateTableCellSpans);
}