diff options
71 files changed, 51 insertions, 84 deletions
@@ -36,4 +36,4 @@ improvement patches upstream to its origin to mutually improve the platform and a future for XUL. ## Looking for Pale Moon and Basilisk? -As of [`Issue #969`](https://github.com/MoonchildProductions/UXP/issues/969), release versions `28.9.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://github.com/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://github.com/MoonchildProductions/Basilisk). +As of [`Issue #969`](https://repo.palemoon.org/MoonchildProductions/UXP/issues/969), release versions `28.9.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://repo.palemoon.org/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://repo.palemoon.org/MoonchildProductions/Basilisk). diff --git a/SECURITY.md b/SECURITY.md index af9c916cd..8ef831674 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ Generally not security vulnerabilities: ## Reporting a Vulnerability If you find an issue in UXP or the applications it builds on that could impact the security or safety of users please **do not** -make an issue on GitHub about it. GitHub does not support restricted viewability for security sensitive bugs. +make an issue on Gitea about it. Gitea does not support restricted viewability for security sensitive bugs. If you want to report a security-sensitive issue then please go to the [forum](https://forum.palemoon.org) and report the issue via a **private message** to **Moonchild** (the founder and prime responsible for security issues). diff --git a/config/milestone.txt b/config/milestone.txt index 8642dc41d..642399584 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.6.0
\ No newline at end of file +4.7.0
\ No newline at end of file diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 7ddc2184b..1226ef22e 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -932,8 +932,12 @@ nsImageLoadingContent::LoadImage(nsIURI* aNewURI, MOZ_ASSERT(!req, "Shouldn't have non-null request here"); // If we don't have a current URI, we might as well store this URI so people // know what we tried (and failed) to load. - if (!mCurrentRequest) + if (!mCurrentRequest) { mCurrentURI = aNewURI; + if (mImageBlockingStatus == nsIContentPolicy::ACCEPT) { + mImageBlockingStatus = nsIContentPolicy::REJECT_REQUEST; + } + } FireEvent(NS_LITERAL_STRING("error")); FireEvent(NS_LITERAL_STRING("loadend")); diff --git a/layout/mathml/tests/stretchy-and-large-operators.html b/layout/mathml/tests/stretchy-and-large-operators.html index 13fe14aa7..0632c46d8 100644 --- a/layout/mathml/tests/stretchy-and-large-operators.html +++ b/layout/mathml/tests/stretchy-and-large-operators.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list index 1a610811d..0eddb61fc 100644 --- a/layout/reftests/image/reftest.list +++ b/layout/reftests/image/reftest.list @@ -126,3 +126,5 @@ fuzzy(1,1) == image-orientation-background.html?90&flip image-orientation-r == image-resize-percent-height.html image-resize-ref.html == image-resize-percent-width.html image-resize-ref.html + +== unknown-protocol.html unknown-protocol-ref.html diff --git a/layout/reftests/image/unknown-protocol-ref.html b/layout/reftests/image/unknown-protocol-ref.html new file mode 100644 index 000000000..b5bb326ee --- /dev/null +++ b/layout/reftests/image/unknown-protocol-ref.html @@ -0,0 +1 @@ +<img src="mailto://foo"> diff --git a/layout/reftests/image/unknown-protocol.html b/layout/reftests/image/unknown-protocol.html new file mode 100644 index 000000000..ef06881b7 --- /dev/null +++ b/layout/reftests/image/unknown-protocol.html @@ -0,0 +1 @@ +<img src="foobar://baz"> diff --git a/layout/reftests/mathml/columnlines-1-ref.html b/layout/reftests/mathml/columnlines-1-ref.html index e5ea01a7d..8556fb1be 100644 --- a/layout/reftests/mathml/columnlines-1-ref.html +++ b/layout/reftests/mathml/columnlines-1-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-1a.html b/layout/reftests/mathml/columnlines-1a.html index 3f391c296..541d74cd7 100644 --- a/layout/reftests/mathml/columnlines-1a.html +++ b/layout/reftests/mathml/columnlines-1a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-1b.html b/layout/reftests/mathml/columnlines-1b.html index 9ee1a3e35..3a441a1b8 100644 --- a/layout/reftests/mathml/columnlines-1b.html +++ b/layout/reftests/mathml/columnlines-1b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-1c.html b/layout/reftests/mathml/columnlines-1c.html index d1bd0d7ce..51e33ce84 100644 --- a/layout/reftests/mathml/columnlines-1c.html +++ b/layout/reftests/mathml/columnlines-1c.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-2-ref.html b/layout/reftests/mathml/columnlines-2-ref.html index 84c96c5fe..6fcd823ce 100644 --- a/layout/reftests/mathml/columnlines-2-ref.html +++ b/layout/reftests/mathml/columnlines-2-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-2a.html b/layout/reftests/mathml/columnlines-2a.html index ea3ed5abe..54eb8e928 100644 --- a/layout/reftests/mathml/columnlines-2a.html +++ b/layout/reftests/mathml/columnlines-2a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-2b.html b/layout/reftests/mathml/columnlines-2b.html index 36182d60a..5c2447b40 100644 --- a/layout/reftests/mathml/columnlines-2b.html +++ b/layout/reftests/mathml/columnlines-2b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-3-1-ref.html b/layout/reftests/mathml/columnlines-3-1-ref.html index ce49f5dad..3f162127e 100644 --- a/layout/reftests/mathml/columnlines-3-1-ref.html +++ b/layout/reftests/mathml/columnlines-3-1-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-3-1.html b/layout/reftests/mathml/columnlines-3-1.html index 80c46858e..e7c6fd759 100644 --- a/layout/reftests/mathml/columnlines-3-1.html +++ b/layout/reftests/mathml/columnlines-3-1.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-3-2-ref.html b/layout/reftests/mathml/columnlines-3-2-ref.html index 6549ad526..6727d8fcd 100644 --- a/layout/reftests/mathml/columnlines-3-2-ref.html +++ b/layout/reftests/mathml/columnlines-3-2-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/columnlines-3-2.html b/layout/reftests/mathml/columnlines-3-2.html index 789013d9f..24ef9268c 100644 --- a/layout/reftests/mathml/columnlines-3-2.html +++ b/layout/reftests/mathml/columnlines-3-2.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1-ref.html b/layout/reftests/mathml/menclose-1-ref.html index 2302a2b8d..a6b2d7257 100644 --- a/layout/reftests/mathml/menclose-1-ref.html +++ b/layout/reftests/mathml/menclose-1-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1a.html b/layout/reftests/mathml/menclose-1a.html index 649ea0ea2..cc7ae54a6 100644 --- a/layout/reftests/mathml/menclose-1a.html +++ b/layout/reftests/mathml/menclose-1a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1b.html b/layout/reftests/mathml/menclose-1b.html index d46e43d42..03e7aea5d 100644 --- a/layout/reftests/mathml/menclose-1b.html +++ b/layout/reftests/mathml/menclose-1b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1c.html b/layout/reftests/mathml/menclose-1c.html index cca82fb38..0a1a93c7d 100644 --- a/layout/reftests/mathml/menclose-1c.html +++ b/layout/reftests/mathml/menclose-1c.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1d.html b/layout/reftests/mathml/menclose-1d.html index 6c98cdb96..0dbd557fe 100644 --- a/layout/reftests/mathml/menclose-1d.html +++ b/layout/reftests/mathml/menclose-1d.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1e.html b/layout/reftests/mathml/menclose-1e.html index 6c1d4bc2d..c3b4231d7 100644 --- a/layout/reftests/mathml/menclose-1e.html +++ b/layout/reftests/mathml/menclose-1e.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1f.html b/layout/reftests/mathml/menclose-1f.html index f4409e20b..c12dedb54 100644 --- a/layout/reftests/mathml/menclose-1f.html +++ b/layout/reftests/mathml/menclose-1f.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1g.html b/layout/reftests/mathml/menclose-1g.html index 97a88eba2..48dceadf0 100644 --- a/layout/reftests/mathml/menclose-1g.html +++ b/layout/reftests/mathml/menclose-1g.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1h.html b/layout/reftests/mathml/menclose-1h.html index fa17c0789..79f7d6c02 100644 --- a/layout/reftests/mathml/menclose-1h.html +++ b/layout/reftests/mathml/menclose-1h.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1i.html b/layout/reftests/mathml/menclose-1i.html index 062ef17f5..2e5fc559e 100644 --- a/layout/reftests/mathml/menclose-1i.html +++ b/layout/reftests/mathml/menclose-1i.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1j.html b/layout/reftests/mathml/menclose-1j.html index 175f65aa3..a992b0014 100644 --- a/layout/reftests/mathml/menclose-1j.html +++ b/layout/reftests/mathml/menclose-1j.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1k.html b/layout/reftests/mathml/menclose-1k.html index 03f9d15fc..4704d64fd 100644 --- a/layout/reftests/mathml/menclose-1k.html +++ b/layout/reftests/mathml/menclose-1k.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1l.html b/layout/reftests/mathml/menclose-1l.html index dce96364d..a11c337f2 100644 --- a/layout/reftests/mathml/menclose-1l.html +++ b/layout/reftests/mathml/menclose-1l.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1m.html b/layout/reftests/mathml/menclose-1m.html index 4acdaf914..e505289ce 100644 --- a/layout/reftests/mathml/menclose-1m.html +++ b/layout/reftests/mathml/menclose-1m.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1n.html b/layout/reftests/mathml/menclose-1n.html index 3557fc348..c9c252c1a 100644 --- a/layout/reftests/mathml/menclose-1n.html +++ b/layout/reftests/mathml/menclose-1n.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1o.html b/layout/reftests/mathml/menclose-1o.html index 231aeaa09..f7fcfd6bd 100644 --- a/layout/reftests/mathml/menclose-1o.html +++ b/layout/reftests/mathml/menclose-1o.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/menclose-1p.html b/layout/reftests/mathml/menclose-1p.html index 5bff5e02f..ac92a52e0 100644 --- a/layout/reftests/mathml/menclose-1p.html +++ b/layout/reftests/mathml/menclose-1p.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/mo-lspace-rspace-ref.html b/layout/reftests/mathml/mo-lspace-rspace-ref.html index e8a409610..5c97ddf1c 100644 --- a/layout/reftests/mathml/mo-lspace-rspace-ref.html +++ b/layout/reftests/mathml/mo-lspace-rspace-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/mo-lspace-rspace.html b/layout/reftests/mathml/mo-lspace-rspace.html index 68fd59b37..f5833a5f1 100644 --- a/layout/reftests/mathml/mo-lspace-rspace.html +++ b/layout/reftests/mathml/mo-lspace-rspace.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-1-ref.html b/layout/reftests/mathml/rowlines-1-ref.html index e5ea01a7d..8556fb1be 100644 --- a/layout/reftests/mathml/rowlines-1-ref.html +++ b/layout/reftests/mathml/rowlines-1-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-1a.html b/layout/reftests/mathml/rowlines-1a.html index 51073e3d5..023dc151d 100644 --- a/layout/reftests/mathml/rowlines-1a.html +++ b/layout/reftests/mathml/rowlines-1a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-1b.html b/layout/reftests/mathml/rowlines-1b.html index 860edda59..b41b6dac7 100644 --- a/layout/reftests/mathml/rowlines-1b.html +++ b/layout/reftests/mathml/rowlines-1b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-1c.html b/layout/reftests/mathml/rowlines-1c.html index dd51f155f..53bacf25c 100644 --- a/layout/reftests/mathml/rowlines-1c.html +++ b/layout/reftests/mathml/rowlines-1c.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-2-ref.html b/layout/reftests/mathml/rowlines-2-ref.html index f66962bad..d2dd4e444 100644 --- a/layout/reftests/mathml/rowlines-2-ref.html +++ b/layout/reftests/mathml/rowlines-2-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-2a.html b/layout/reftests/mathml/rowlines-2a.html index 2dfa6cb04..058d39aa1 100644 --- a/layout/reftests/mathml/rowlines-2a.html +++ b/layout/reftests/mathml/rowlines-2a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-2b.html b/layout/reftests/mathml/rowlines-2b.html index 3489239d1..de973b547 100644 --- a/layout/reftests/mathml/rowlines-2b.html +++ b/layout/reftests/mathml/rowlines-2b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-3-1-ref.html b/layout/reftests/mathml/rowlines-3-1-ref.html index 9f292f7ce..4f6f70af3 100644 --- a/layout/reftests/mathml/rowlines-3-1-ref.html +++ b/layout/reftests/mathml/rowlines-3-1-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-3-1.html b/layout/reftests/mathml/rowlines-3-1.html index e40b2b7fa..c9af50dc1 100644 --- a/layout/reftests/mathml/rowlines-3-1.html +++ b/layout/reftests/mathml/rowlines-3-1.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-3-2-ref.html b/layout/reftests/mathml/rowlines-3-2-ref.html index 01fe8ad0d..94dff55d5 100644 --- a/layout/reftests/mathml/rowlines-3-2-ref.html +++ b/layout/reftests/mathml/rowlines-3-2-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/rowlines-3-2.html b/layout/reftests/mathml/rowlines-3-2.html index 685970faf..e2e9267ae 100644 --- a/layout/reftests/mathml/rowlines-3-2.html +++ b/layout/reftests/mathml/rowlines-3-2.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <head> diff --git a/layout/reftests/mathml/tablespacing-8-ref.html b/layout/reftests/mathml/tablespacing-8-ref.html index a39c15b3d..4c4b1c28f 100644 --- a/layout/reftests/mathml/tablespacing-8-ref.html +++ b/layout/reftests/mathml/tablespacing-8-ref.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <body> diff --git a/layout/reftests/mathml/tablespacing-8a.html b/layout/reftests/mathml/tablespacing-8a.html index 3e2b42c9e..bbdbb4de0 100644 --- a/layout/reftests/mathml/tablespacing-8a.html +++ b/layout/reftests/mathml/tablespacing-8a.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <body> diff --git a/layout/reftests/mathml/tablespacing-8b.html b/layout/reftests/mathml/tablespacing-8b.html index db29f12b5..8228866b8 100644 --- a/layout/reftests/mathml/tablespacing-8b.html +++ b/layout/reftests/mathml/tablespacing-8b.html @@ -1,5 +1,4 @@ <!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- --> -<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: --> <!DOCTYPE html> <html> <body> diff --git a/layout/reftests/svg/mask-img-ref.html b/layout/reftests/svg/mask-img-ref.html index a9505112c..5504fbd01 100644 --- a/layout/reftests/svg/mask-img-ref.html +++ b/layout/reftests/svg/mask-img-ref.html @@ -2,7 +2,6 @@ <html>
<body style="margin:0">
<img src='data:image/svg+xml,
-<!-- vim: set expandtab ts=2 sw=2 tw=80: -->
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 700 130">
diff --git a/layout/reftests/svg/mask-img.html b/layout/reftests/svg/mask-img.html index e080a1b08..31fe9b8c3 100644 --- a/layout/reftests/svg/mask-img.html +++ b/layout/reftests/svg/mask-img.html @@ -3,7 +3,6 @@ <body style="margin:0">
<div style="height:50px"></div>
<img border=0 src='data:image/svg+xml,
-<!-- vim: set expandtab ts=2 sw=2 tw=80: -->
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 700 80">
diff --git a/layout/style/test/test_cascade.html b/layout/style/test/test_cascade.html index 0a5d27a8b..b2836d25c 100644 --- a/layout/style/test/test_cascade.html +++ b/layout/style/test/test_cascade.html @@ -1,5 +1,4 @@ <!DOCTYPE HTML> -<!-- vim: set shiftwidth=4 tabstop=8 autoindent expandtab: --> <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 1d47da584..7e11a978b 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -103,6 +103,14 @@ struct TableReflowInput { availSize.BSize(wm) = std::max(0, availSize.BSize(wm)); } } +
+ void ReduceAvailableBSizeBy(WritingMode aWM, nscoord aAmount) {
+ if (availSize.BSize(aWM) == NS_UNCONSTRAINEDSIZE) {
+ return;
+ }
+ availSize.BSize(aWM) -= aAmount;
+ availSize.BSize(aWM) = std::max(0, availSize.BSize(aWM));
+ } }; } // namespace mozilla @@ -2681,9 +2689,7 @@ nsTableFrame::PlaceChild(TableReflowInput& aReflowInput, aReflowInput.bCoord += aKidDesiredSize.BSize(wm); // If our bsize is constrained, then update the available bsize - if (NS_UNCONSTRAINEDSIZE != aReflowInput.availSize.BSize(wm)) { - aReflowInput.availSize.BSize(wm) -= aKidDesiredSize.BSize(wm); - } + aReflowInput.ReduceAvailableBSizeBy(wm, aKidDesiredSize.BSize(wm)); } void @@ -2927,17 +2933,28 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput, // using the footer's prev-in-flow's height instead of reflowing it again, // but there's no real need. if (isPaginated) { + bool reorder = false; if (thead && !GetPrevInFlow()) { + if (thead->GetNextInFlow()) { + reorder = true; + } nscoord desiredHeight; nsresult rv = SetupHeaderFooterChild(aReflowInput, thead, &desiredHeight); if (NS_FAILED(rv)) return; } if (tfoot) { + if (tfoot->GetNextInFlow()) { + reorder = true; + } nsresult rv = SetupHeaderFooterChild(aReflowInput, tfoot, &footerHeight); if (NS_FAILED(rv)) return; } + if (reorder) { + // Reorder row groups, because the reflow may have changed what's next-in-flow. + OrderRowGroups(rowGroups, &thead, &tfoot); + } } // if the child is a tbody in paginated mode reduce the height by a repeated footer bool allowRepeatedFooter = false; @@ -3003,14 +3020,13 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput, kidReflowInput.mFlags.mIsTopOfPage = false; } aReflowInput.bCoord += cellSpacingB; - if (NS_UNCONSTRAINEDSIZE != aReflowInput.availSize.BSize(wm)) { - aReflowInput.availSize.BSize(wm) -= cellSpacingB; - } + aReflowInput.ReduceAvailableBSizeBy(wm, cellSpacingB); // record the presence of a next in flow, it might get destroyed so we // need to reorder the row group array bool reorder = false; - if (kidFrame->GetNextInFlow()) + if (kidFrame->GetNextInFlow()) { reorder = true; + } LogicalPoint kidPosition(wm, aReflowInput.iCoord, aReflowInput.bCoord); ReflowChild(kidFrame, presContext, desiredSize, kidReflowInput, @@ -3018,7 +3034,7 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput, kidReflowInput.ApplyRelativePositioning(&kidPosition, containerSize); if (reorder) { - // reorder row groups the reflow may have changed the nextinflows + // Reorder row groups, because the reflow may have changed what's next-in-flow. OrderRowGroups(rowGroups, &thead, &tfoot); childX = rowGroups.IndexOf(kidFrame); if (childX == RowGroupArray::NoIndex) { @@ -3170,9 +3186,7 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput, aReflowInput.bCoord += kidRect.BSize(wm); // If our bsize is constrained then update the available bsize. - if (NS_UNCONSTRAINEDSIZE != aReflowInput.availSize.BSize(wm)) { - aReflowInput.availSize.BSize(wm) -= cellSpacingB + kidRect.BSize(wm); - } + aReflowInput.ReduceAvailableBSizeBy(wm, cellSpacingB + kidRect.BSize(wm)); } } diff --git a/netwerk/base/nsIncrementalStreamLoader.cpp b/netwerk/base/nsIncrementalStreamLoader.cpp index a7298be3f..8890333f8 100644 --- a/netwerk/base/nsIncrementalStreamLoader.cpp +++ b/netwerk/base/nsIncrementalStreamLoader.cpp @@ -11,10 +11,7 @@ #include <limits> -nsIncrementalStreamLoader::nsIncrementalStreamLoader() - : mData(), mBytesConsumed(0) -{ -} +nsIncrementalStreamLoader::nsIncrementalStreamLoader() = default; nsIncrementalStreamLoader::~nsIncrementalStreamLoader() { @@ -49,7 +46,7 @@ NS_IMPL_ISUPPORTS(nsIncrementalStreamLoader, nsIIncrementalStreamLoader, NS_IMETHODIMP nsIncrementalStreamLoader::GetNumBytesRead(uint32_t* aNumBytes) { - *aNumBytes = mBytesConsumed + mData.length(); + *aNumBytes = mBytesRead; return NS_OK; } @@ -180,7 +177,6 @@ nsIncrementalStreamLoader::WriteSegmentFun(nsIInputStream *inStr, } } - self->mBytesConsumed += consumedCount; *writeCount = count; return NS_OK; @@ -198,6 +194,8 @@ nsIncrementalStreamLoader::OnDataAvailable(nsIRequest* request, nsISupports *ctx uint32_t countRead; nsresult rv = inStr->ReadSegments(WriteSegmentFun, this, count, &countRead); mRequest = nullptr; + NS_ENSURE_SUCCESS(rv, rv); + mBytesRead += countRead; return rv; } diff --git a/netwerk/base/nsIncrementalStreamLoader.h b/netwerk/base/nsIncrementalStreamLoader.h index f04d4a958..0e2b532e6 100644 --- a/netwerk/base/nsIncrementalStreamLoader.h +++ b/netwerk/base/nsIncrementalStreamLoader.h @@ -47,8 +47,9 @@ protected: // available. mozilla::Vector<uint8_t, 0> mData; - // Number of consumed bytes from the mData. - size_t mBytesConsumed; + // Number of bytes read, which may differ from the number of bytes in mData, + // since we incrementally remove from there. + mozilla::Atomic<uint32_t, mozilla::Relaxed> mBytesRead; }; #endif // nsIncrementalStreamLoader_h__ diff --git a/netwerk/base/nsStreamLoader.cpp b/netwerk/base/nsStreamLoader.cpp index a73b038a7..9990d1882 100644 --- a/netwerk/base/nsStreamLoader.cpp +++ b/netwerk/base/nsStreamLoader.cpp @@ -54,7 +54,7 @@ NS_IMPL_ISUPPORTS(nsStreamLoader, nsIStreamLoader, NS_IMETHODIMP nsStreamLoader::GetNumBytesRead(uint32_t* aNumBytes) { - *aNumBytes = mData.length(); + *aNumBytes = mBytesRead; return NS_OK; } @@ -150,7 +150,10 @@ nsStreamLoader::OnDataAvailable(nsIRequest* request, nsISupports *ctxt, uint64_t sourceOffset, uint32_t count) { uint32_t countRead; - return inStr->ReadSegments(WriteSegmentFun, this, count, &countRead); + nsresult rv = inStr->ReadSegments(WriteSegmentFun, this, count, &countRead); + NS_ENSURE_SUCCESS(rv, rv); + mBytesRead += countRead; + return NS_OK; } void diff --git a/netwerk/base/nsStreamLoader.h b/netwerk/base/nsStreamLoader.h index 671fc441f..b611a1aed 100644 --- a/netwerk/base/nsStreamLoader.h +++ b/netwerk/base/nsStreamLoader.h @@ -47,6 +47,8 @@ protected: nsCOMPtr<nsIRequest> mRequest; nsCOMPtr<nsIRequestObserver> mRequestObserver; + mozilla::Atomic<uint32_t, mozilla::Relaxed> mBytesRead; + // Buffer to accumulate incoming data. We preallocate if contentSize is // available. mozilla::Vector<uint8_t, 0> mData; diff --git a/netwerk/test/mochitests/test_1396395.html b/netwerk/test/mochitests/test_1396395.html index 193ef219c..0baae57a5 100644 --- a/netwerk/test/mochitests/test_1396395.html +++ b/netwerk/test/mochitests/test_1396395.html @@ -1,5 +1,4 @@ <!DOCTYPE HTML> -<!-- vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: --> <html> <!-- Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ --> diff --git a/security/manager/ssl/tests/unit/test_cert_version/generate.py b/security/manager/ssl/tests/unit/test_cert_version/generate.py index 7e4747d63..b99cbefe2 100755 --- a/security/manager/ssl/tests/unit/test_cert_version/generate.py +++ b/security/manager/ssl/tests/unit/test_cert_version/generate.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py b/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py index a0c50b1ed..ad2dec8b5 100644 --- a/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py +++ b/security/manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py @@ -1,5 +1,4 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py b/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py index a7f060481..6e714b4fd 100644 --- a/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py +++ b/security/manager/ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py @@ -1,5 +1,4 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/testing/mozbase/mozprocess/tests/iniparser/dictionary.c b/testing/mozbase/mozprocess/tests/iniparser/dictionary.c index da41d9b2e..7d973e0fe 100644 --- a/testing/mozbase/mozprocess/tests/iniparser/dictionary.c +++ b/testing/mozbase/mozprocess/tests/iniparser/dictionary.c @@ -404,4 +404,3 @@ int main(int argc, char *argv[]) return 0 ; } #endif -/* vim: set ts=4 et sw=4 tw=75 */ diff --git a/testing/mozbase/mozprocess/tests/iniparser/iniparser.c b/testing/mozbase/mozprocess/tests/iniparser/iniparser.c index 02a23b755..959d8aa04 100644 --- a/testing/mozbase/mozprocess/tests/iniparser/iniparser.c +++ b/testing/mozbase/mozprocess/tests/iniparser/iniparser.c @@ -645,4 +645,3 @@ void iniparser_freedict(dictionary * d) dictionary_del(d); } -/* vim: set ts=4 et sw=4 tw=75 */ diff --git a/testing/tools/iceserver/iceserver.py b/testing/tools/iceserver/iceserver.py index 3e1d31de9..2089301af 100644 --- a/testing/tools/iceserver/iceserver.py +++ b/testing/tools/iceserver/iceserver.py @@ -1,4 +1,3 @@ -# vim: set ts=4 et sw=4 tw=80 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/testing/tools/websocketprocessbridge/websocketprocessbridge.py b/testing/tools/websocketprocessbridge/websocketprocessbridge.py index 57bab31a4..02418d0e6 100644 --- a/testing/tools/websocketprocessbridge/websocketprocessbridge.py +++ b/testing/tools/websocketprocessbridge/websocketprocessbridge.py @@ -1,4 +1,3 @@ -# vim: set ts=4 et sw=4 tw=80 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html b/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html index 746792fb7..557a22633 100644 --- a/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html +++ b/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html @@ -370,4 +370,3 @@ Object.keys(encodingMap).forEach(function(name) { }); }); </script> -<!-- vim: set expandtab tabstop=2 shiftwidth=2: --> diff --git a/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html b/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html index afae60aad..bdbf4fcd0 100644 --- a/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html +++ b/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html @@ -84,4 +84,3 @@ testNodes.forEach(function(referenceName) { testDiv.parentNode.removeChild(testDiv); </script> -<!-- vim: set expandtab tabstop=2 shiftwidth=2: --> diff --git a/testing/web-platform/tests/dom/nodes/Node-contains.html b/testing/web-platform/tests/dom/nodes/Node-contains.html index a3d644866..bf10a1d94 100644 --- a/testing/web-platform/tests/dom/nodes/Node-contains.html +++ b/testing/web-platform/tests/dom/nodes/Node-contains.html @@ -33,4 +33,3 @@ testNodes.forEach(function(referenceName) { testDiv.parentNode.removeChild(testDiv); </script> -<!-- vim: set expandtab tabstop=2 shiftwidth=2: --> |