From efa2f805fe83dd96f9baf1783f4e58f750af63cf Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 23 Oct 2020 08:10:01 +0000 Subject: [PATCH 1/7] [netwerk] Make nsIncrementalStreamLoader's GetNumBytesRead threadsafe. This prevents a potential race and simplifies the code a bit by keeping the bytes read separate instead of using mData, which is modified from another thread from OnDataAvailable. Relaxed atomics are fine for these, since they don't guard any memory. --- netwerk/base/nsIncrementalStreamLoader.cpp | 10 ++++------ netwerk/base/nsIncrementalStreamLoader.h | 5 +++-- netwerk/base/nsStreamLoader.cpp | 7 +++++-- netwerk/base/nsStreamLoader.h | 2 ++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/netwerk/base/nsIncrementalStreamLoader.cpp b/netwerk/base/nsIncrementalStreamLoader.cpp index a7298be3f0..8890333f84 100644 --- a/netwerk/base/nsIncrementalStreamLoader.cpp +++ b/netwerk/base/nsIncrementalStreamLoader.cpp @@ -11,10 +11,7 @@ #include -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 f04d4a9583..0e2b532e6d 100644 --- a/netwerk/base/nsIncrementalStreamLoader.h +++ b/netwerk/base/nsIncrementalStreamLoader.h @@ -47,8 +47,9 @@ protected: // available. mozilla::Vector 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 mBytesRead; }; #endif // nsIncrementalStreamLoader_h__ diff --git a/netwerk/base/nsStreamLoader.cpp b/netwerk/base/nsStreamLoader.cpp index a73b038a7e..9990d18822 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 671fc441ff..b611a1aedd 100644 --- a/netwerk/base/nsStreamLoader.h +++ b/netwerk/base/nsStreamLoader.h @@ -47,6 +47,8 @@ protected: nsCOMPtr mRequest; nsCOMPtr mRequestObserver; + mozilla::Atomic mBytesRead; + // Buffer to accumulate incoming data. We preallocate if contentSize is // available. mozilla::Vector mData; From c9b506acfd4588e978c8745e91bab7432caae21f Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 23 Oct 2020 09:27:56 +0000 Subject: [PATCH 2/7] Bump platform version for added features. --- config/milestone.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/milestone.txt b/config/milestone.txt index 8642dc41d7..6423995849 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 From cc0dab1b672dbb7d2cd1eba7a0ba7cb486bb7708 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 23 Oct 2020 10:36:09 +0000 Subject: [PATCH 3/7] [layout] Avoid negative availSize.BSizes in paginated table reflow. --- layout/tables/nsTableFrame.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 1d47da5849..3e7607e4fe 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 @@ -3003,9 +3009,7 @@ 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; @@ -3170,9 +3174,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)); } } From 975b2cbf74acf7d0fceda6dbc0c17532d64a33ca Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 23 Oct 2020 11:10:13 +0000 Subject: [PATCH 4/7] [layout] Re-order rowgroups if reflowing. This logic was missing for tfoot. See existing code in second hunk. --- layout/tables/nsTableFrame.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 3e7607e4fe..7e11a978b1 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -2933,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; @@ -3013,8 +3024,9 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput, // 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, @@ -3022,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) { From a77ab3da7fd4ded4b93b190873be1c0da87abfbc Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 26 Oct 2020 19:09:16 +0000 Subject: [PATCH 5/7] Issue #1656 - Nuke the remaining vim lines in UXP Closes #1656 --- layout/mathml/tests/stretchy-and-large-operators.html | 1 - layout/reftests/mathml/columnlines-1-ref.html | 1 - layout/reftests/mathml/columnlines-1a.html | 1 - layout/reftests/mathml/columnlines-1b.html | 1 - layout/reftests/mathml/columnlines-1c.html | 1 - layout/reftests/mathml/columnlines-2-ref.html | 1 - layout/reftests/mathml/columnlines-2a.html | 1 - layout/reftests/mathml/columnlines-2b.html | 1 - layout/reftests/mathml/columnlines-3-1-ref.html | 1 - layout/reftests/mathml/columnlines-3-1.html | 1 - layout/reftests/mathml/columnlines-3-2-ref.html | 1 - layout/reftests/mathml/columnlines-3-2.html | 1 - layout/reftests/mathml/menclose-1-ref.html | 1 - layout/reftests/mathml/menclose-1a.html | 1 - layout/reftests/mathml/menclose-1b.html | 1 - layout/reftests/mathml/menclose-1c.html | 1 - layout/reftests/mathml/menclose-1d.html | 1 - layout/reftests/mathml/menclose-1e.html | 1 - layout/reftests/mathml/menclose-1f.html | 1 - layout/reftests/mathml/menclose-1g.html | 1 - layout/reftests/mathml/menclose-1h.html | 1 - layout/reftests/mathml/menclose-1i.html | 1 - layout/reftests/mathml/menclose-1j.html | 1 - layout/reftests/mathml/menclose-1k.html | 1 - layout/reftests/mathml/menclose-1l.html | 1 - layout/reftests/mathml/menclose-1m.html | 1 - layout/reftests/mathml/menclose-1n.html | 1 - layout/reftests/mathml/menclose-1o.html | 1 - layout/reftests/mathml/menclose-1p.html | 1 - layout/reftests/mathml/mo-lspace-rspace-ref.html | 1 - layout/reftests/mathml/mo-lspace-rspace.html | 1 - layout/reftests/mathml/rowlines-1-ref.html | 1 - layout/reftests/mathml/rowlines-1a.html | 1 - layout/reftests/mathml/rowlines-1b.html | 1 - layout/reftests/mathml/rowlines-1c.html | 1 - layout/reftests/mathml/rowlines-2-ref.html | 1 - layout/reftests/mathml/rowlines-2a.html | 1 - layout/reftests/mathml/rowlines-2b.html | 1 - layout/reftests/mathml/rowlines-3-1-ref.html | 1 - layout/reftests/mathml/rowlines-3-1.html | 1 - layout/reftests/mathml/rowlines-3-2-ref.html | 1 - layout/reftests/mathml/rowlines-3-2.html | 1 - layout/reftests/mathml/tablespacing-8-ref.html | 1 - layout/reftests/mathml/tablespacing-8a.html | 1 - layout/reftests/mathml/tablespacing-8b.html | 1 - layout/reftests/svg/mask-img-ref.html | 1 - layout/reftests/svg/mask-img.html | 1 - layout/style/test/test_cascade.html | 1 - netwerk/test/mochitests/test_1396395.html | 1 - security/manager/ssl/tests/unit/test_cert_version/generate.py | 1 - .../manager/ssl/tests/unit/test_signed_manifest/nss_ctypes.py | 1 - .../ssl/tests/unit/test_signed_manifest/sign_b2g_manifest.py | 1 - testing/mozbase/mozprocess/tests/iniparser/dictionary.c | 1 - testing/mozbase/mozprocess/tests/iniparser/iniparser.c | 1 - testing/tools/iceserver/iceserver.py | 1 - testing/tools/websocketprocessbridge/websocketprocessbridge.py | 1 - .../tests/dom/nodes/Document-characterSet-normalization.html | 1 - .../tests/dom/nodes/Node-compareDocumentPosition.html | 1 - testing/web-platform/tests/dom/nodes/Node-contains.html | 1 - 59 files changed, 59 deletions(-) diff --git a/layout/mathml/tests/stretchy-and-large-operators.html b/layout/mathml/tests/stretchy-and-large-operators.html index 13fe14aa71..0632c46d8f 100644 --- a/layout/mathml/tests/stretchy-and-large-operators.html +++ b/layout/mathml/tests/stretchy-and-large-operators.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-1-ref.html b/layout/reftests/mathml/columnlines-1-ref.html index e5ea01a7de..8556fb1bee 100644 --- a/layout/reftests/mathml/columnlines-1-ref.html +++ b/layout/reftests/mathml/columnlines-1-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-1a.html b/layout/reftests/mathml/columnlines-1a.html index 3f391c2966..541d74cd78 100644 --- a/layout/reftests/mathml/columnlines-1a.html +++ b/layout/reftests/mathml/columnlines-1a.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-1b.html b/layout/reftests/mathml/columnlines-1b.html index 9ee1a3e35f..3a441a1b8c 100644 --- a/layout/reftests/mathml/columnlines-1b.html +++ b/layout/reftests/mathml/columnlines-1b.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-1c.html b/layout/reftests/mathml/columnlines-1c.html index d1bd0d7ce3..51e33ce840 100644 --- a/layout/reftests/mathml/columnlines-1c.html +++ b/layout/reftests/mathml/columnlines-1c.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-2-ref.html b/layout/reftests/mathml/columnlines-2-ref.html index 84c96c5fe3..6fcd823ce3 100644 --- a/layout/reftests/mathml/columnlines-2-ref.html +++ b/layout/reftests/mathml/columnlines-2-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-2a.html b/layout/reftests/mathml/columnlines-2a.html index ea3ed5abe0..54eb8e9281 100644 --- a/layout/reftests/mathml/columnlines-2a.html +++ b/layout/reftests/mathml/columnlines-2a.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-2b.html b/layout/reftests/mathml/columnlines-2b.html index 36182d60ad..5c2447b408 100644 --- a/layout/reftests/mathml/columnlines-2b.html +++ b/layout/reftests/mathml/columnlines-2b.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/columnlines-3-1-ref.html b/layout/reftests/mathml/columnlines-3-1-ref.html index ce49f5dad4..3f162127e9 100644 --- a/layout/reftests/mathml/columnlines-3-1-ref.html +++ b/layout/reftests/mathml/columnlines-3-1-ref.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/columnlines-3-1.html b/layout/reftests/mathml/columnlines-3-1.html index 80c46858e6..e7c6fd7596 100644 --- a/layout/reftests/mathml/columnlines-3-1.html +++ b/layout/reftests/mathml/columnlines-3-1.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/columnlines-3-2-ref.html b/layout/reftests/mathml/columnlines-3-2-ref.html index 6549ad5263..6727d8fcdd 100644 --- a/layout/reftests/mathml/columnlines-3-2-ref.html +++ b/layout/reftests/mathml/columnlines-3-2-ref.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/columnlines-3-2.html b/layout/reftests/mathml/columnlines-3-2.html index 789013d9f0..24ef9268c6 100644 --- a/layout/reftests/mathml/columnlines-3-2.html +++ b/layout/reftests/mathml/columnlines-3-2.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/menclose-1-ref.html b/layout/reftests/mathml/menclose-1-ref.html index 2302a2b8d8..a6b2d72572 100644 --- a/layout/reftests/mathml/menclose-1-ref.html +++ b/layout/reftests/mathml/menclose-1-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1a.html b/layout/reftests/mathml/menclose-1a.html index 649ea0ea2e..cc7ae54a6c 100644 --- a/layout/reftests/mathml/menclose-1a.html +++ b/layout/reftests/mathml/menclose-1a.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1b.html b/layout/reftests/mathml/menclose-1b.html index d46e43d422..03e7aea5d3 100644 --- a/layout/reftests/mathml/menclose-1b.html +++ b/layout/reftests/mathml/menclose-1b.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1c.html b/layout/reftests/mathml/menclose-1c.html index cca82fb385..0a1a93c7d2 100644 --- a/layout/reftests/mathml/menclose-1c.html +++ b/layout/reftests/mathml/menclose-1c.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1d.html b/layout/reftests/mathml/menclose-1d.html index 6c98cdb962..0dbd557fe1 100644 --- a/layout/reftests/mathml/menclose-1d.html +++ b/layout/reftests/mathml/menclose-1d.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1e.html b/layout/reftests/mathml/menclose-1e.html index 6c1d4bc2d1..c3b4231d7b 100644 --- a/layout/reftests/mathml/menclose-1e.html +++ b/layout/reftests/mathml/menclose-1e.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1f.html b/layout/reftests/mathml/menclose-1f.html index f4409e20bf..c12dedb546 100644 --- a/layout/reftests/mathml/menclose-1f.html +++ b/layout/reftests/mathml/menclose-1f.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1g.html b/layout/reftests/mathml/menclose-1g.html index 97a88eba28..48dceadf0b 100644 --- a/layout/reftests/mathml/menclose-1g.html +++ b/layout/reftests/mathml/menclose-1g.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1h.html b/layout/reftests/mathml/menclose-1h.html index fa17c07895..79f7d6c021 100644 --- a/layout/reftests/mathml/menclose-1h.html +++ b/layout/reftests/mathml/menclose-1h.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1i.html b/layout/reftests/mathml/menclose-1i.html index 062ef17f59..2e5fc559eb 100644 --- a/layout/reftests/mathml/menclose-1i.html +++ b/layout/reftests/mathml/menclose-1i.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1j.html b/layout/reftests/mathml/menclose-1j.html index 175f65aa39..a992b00145 100644 --- a/layout/reftests/mathml/menclose-1j.html +++ b/layout/reftests/mathml/menclose-1j.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1k.html b/layout/reftests/mathml/menclose-1k.html index 03f9d15fc8..4704d64fd2 100644 --- a/layout/reftests/mathml/menclose-1k.html +++ b/layout/reftests/mathml/menclose-1k.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1l.html b/layout/reftests/mathml/menclose-1l.html index dce96364d4..a11c337f22 100644 --- a/layout/reftests/mathml/menclose-1l.html +++ b/layout/reftests/mathml/menclose-1l.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1m.html b/layout/reftests/mathml/menclose-1m.html index 4acdaf914d..e505289cec 100644 --- a/layout/reftests/mathml/menclose-1m.html +++ b/layout/reftests/mathml/menclose-1m.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1n.html b/layout/reftests/mathml/menclose-1n.html index 3557fc3483..c9c252c1ae 100644 --- a/layout/reftests/mathml/menclose-1n.html +++ b/layout/reftests/mathml/menclose-1n.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1o.html b/layout/reftests/mathml/menclose-1o.html index 231aeaa09b..f7fcfd6bd2 100644 --- a/layout/reftests/mathml/menclose-1o.html +++ b/layout/reftests/mathml/menclose-1o.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/menclose-1p.html b/layout/reftests/mathml/menclose-1p.html index 5bff5e02fe..ac92a52e0c 100644 --- a/layout/reftests/mathml/menclose-1p.html +++ b/layout/reftests/mathml/menclose-1p.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/mo-lspace-rspace-ref.html b/layout/reftests/mathml/mo-lspace-rspace-ref.html index e8a409610b..5c97ddf1c8 100644 --- a/layout/reftests/mathml/mo-lspace-rspace-ref.html +++ b/layout/reftests/mathml/mo-lspace-rspace-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/mo-lspace-rspace.html b/layout/reftests/mathml/mo-lspace-rspace.html index 68fd59b378..f5833a5f16 100644 --- a/layout/reftests/mathml/mo-lspace-rspace.html +++ b/layout/reftests/mathml/mo-lspace-rspace.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-1-ref.html b/layout/reftests/mathml/rowlines-1-ref.html index e5ea01a7de..8556fb1bee 100644 --- a/layout/reftests/mathml/rowlines-1-ref.html +++ b/layout/reftests/mathml/rowlines-1-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-1a.html b/layout/reftests/mathml/rowlines-1a.html index 51073e3d51..023dc151d6 100644 --- a/layout/reftests/mathml/rowlines-1a.html +++ b/layout/reftests/mathml/rowlines-1a.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-1b.html b/layout/reftests/mathml/rowlines-1b.html index 860edda594..b41b6dac7b 100644 --- a/layout/reftests/mathml/rowlines-1b.html +++ b/layout/reftests/mathml/rowlines-1b.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-1c.html b/layout/reftests/mathml/rowlines-1c.html index dd51f155f7..53bacf25cf 100644 --- a/layout/reftests/mathml/rowlines-1c.html +++ b/layout/reftests/mathml/rowlines-1c.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-2-ref.html b/layout/reftests/mathml/rowlines-2-ref.html index f66962bad6..d2dd4e444d 100644 --- a/layout/reftests/mathml/rowlines-2-ref.html +++ b/layout/reftests/mathml/rowlines-2-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-2a.html b/layout/reftests/mathml/rowlines-2a.html index 2dfa6cb04a..058d39aa1f 100644 --- a/layout/reftests/mathml/rowlines-2a.html +++ b/layout/reftests/mathml/rowlines-2a.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-2b.html b/layout/reftests/mathml/rowlines-2b.html index 3489239d14..de973b547a 100644 --- a/layout/reftests/mathml/rowlines-2b.html +++ b/layout/reftests/mathml/rowlines-2b.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-3-1-ref.html b/layout/reftests/mathml/rowlines-3-1-ref.html index 9f292f7ce6..4f6f70af38 100644 --- a/layout/reftests/mathml/rowlines-3-1-ref.html +++ b/layout/reftests/mathml/rowlines-3-1-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-3-1.html b/layout/reftests/mathml/rowlines-3-1.html index e40b2b7faf..c9af50dc1f 100644 --- a/layout/reftests/mathml/rowlines-3-1.html +++ b/layout/reftests/mathml/rowlines-3-1.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/rowlines-3-2-ref.html b/layout/reftests/mathml/rowlines-3-2-ref.html index 01fe8ad0d4..94dff55d56 100644 --- a/layout/reftests/mathml/rowlines-3-2-ref.html +++ b/layout/reftests/mathml/rowlines-3-2-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/rowlines-3-2.html b/layout/reftests/mathml/rowlines-3-2.html index 685970faf9..e2e9267ae7 100644 --- a/layout/reftests/mathml/rowlines-3-2.html +++ b/layout/reftests/mathml/rowlines-3-2.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/tablespacing-8-ref.html b/layout/reftests/mathml/tablespacing-8-ref.html index a39c15b3d6..4c4b1c28f9 100644 --- a/layout/reftests/mathml/tablespacing-8-ref.html +++ b/layout/reftests/mathml/tablespacing-8-ref.html @@ -1,5 +1,4 @@ - diff --git a/layout/reftests/mathml/tablespacing-8a.html b/layout/reftests/mathml/tablespacing-8a.html index 3e2b42c9e2..bbdbb4de06 100644 --- a/layout/reftests/mathml/tablespacing-8a.html +++ b/layout/reftests/mathml/tablespacing-8a.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/mathml/tablespacing-8b.html b/layout/reftests/mathml/tablespacing-8b.html index db29f12b52..8228866b8c 100644 --- a/layout/reftests/mathml/tablespacing-8b.html +++ b/layout/reftests/mathml/tablespacing-8b.html @@ -1,5 +1,4 @@  - diff --git a/layout/reftests/svg/mask-img-ref.html b/layout/reftests/svg/mask-img-ref.html index d10fb14870..993517d9cc 100644 --- a/layout/reftests/svg/mask-img-ref.html +++ b/layout/reftests/svg/mask-img-ref.html @@ -2,7 +2,6 @@ diff --git a/layout/style/test/test_cascade.html b/layout/style/test/test_cascade.html index 0a5d27a8b7..b2836d25c1 100644 --- a/layout/style/test/test_cascade.html +++ b/layout/style/test/test_cascade.html @@ -1,5 +1,4 @@ - diff --git a/netwerk/test/mochitests/test_1396395.html b/netwerk/test/mochitests/test_1396395.html index 193ef219cf..0baae57a57 100644 --- a/netwerk/test/mochitests/test_1396395.html +++ b/netwerk/test/mochitests/test_1396395.html @@ -1,5 +1,4 @@ - 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 7e4747d633..b99cbefe2c 100644 --- 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 a0c50b1edd..ad2dec8b5d 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 a7f0604817..6e714b4fdd 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 da41d9b2e6..7d973e0fe9 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 02a23b7559..959d8aa043 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 3e1d31de9a..2089301af8 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 57bab31a48..02418d0e67 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 746792fb78..557a226330 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) { }); }); - diff --git a/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html b/testing/web-platform/tests/dom/nodes/Node-compareDocumentPosition.html index afae60aad1..bdbf4fcd09 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); - diff --git a/testing/web-platform/tests/dom/nodes/Node-contains.html b/testing/web-platform/tests/dom/nodes/Node-contains.html index a3d6448664..bf10a1d949 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); - From 77146fc40fbe0ae8bda188bdb419a6e64eb23067 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 28 Oct 2020 11:59:23 +0000 Subject: [PATCH 6/7] [Pale-Moon] Nuke vim configuration lines from the front-end (no code changes) See MoonchildProductions/UXP#1656 --- application/palemoon/app.mozbuild | 1 - application/palemoon/app/moz.build | 1 - application/palemoon/app/profile/extensions/moz.build | 1 - .../extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build | 1 - application/palemoon/base/moz.build | 1 - application/palemoon/branding/unofficial/content/moz.build | 1 - application/palemoon/branding/unofficial/locales/moz.build | 1 - application/palemoon/branding/unofficial/moz.build | 1 - application/palemoon/components/abouthome/moz.build | 1 - application/palemoon/components/build/moz.build | 1 - application/palemoon/components/certerror/moz.build | 1 - application/palemoon/components/dirprovider/moz.build | 1 - application/palemoon/components/downloads/DownloadsCommon.jsm | 1 - application/palemoon/components/downloads/DownloadsLogger.jsm | 1 - application/palemoon/components/downloads/DownloadsStartup.js | 1 - application/palemoon/components/downloads/DownloadsTaskbar.jsm | 1 - application/palemoon/components/downloads/DownloadsUI.js | 1 - application/palemoon/components/downloads/content/download.xml | 1 - application/palemoon/components/downloads/content/downloads.js | 1 - .../palemoon/components/downloads/content/downloadsOverlay.xul | 1 - application/palemoon/components/downloads/content/indicator.js | 1 - .../palemoon/components/downloads/content/indicatorOverlay.xul | 1 - application/palemoon/components/downloads/moz.build | 1 - application/palemoon/components/feeds/moz.build | 1 - application/palemoon/components/fuel/moz.build | 1 - application/palemoon/components/moz.build | 1 - application/palemoon/components/newtab/moz.build | 1 - application/palemoon/components/pageinfo/moz.build | 1 - application/palemoon/components/permissions/moz.build | 1 - application/palemoon/components/places/moz.build | 1 - application/palemoon/components/preferences/moz.build | 1 - application/palemoon/components/privatebrowsing/moz.build | 1 - application/palemoon/components/search/moz.build | 1 - application/palemoon/components/sessionstore/moz.build | 1 - application/palemoon/components/shell/moz.build | 1 - application/palemoon/components/statusbar/moz.build | 1 - application/palemoon/components/sync/moz.build | 1 - application/palemoon/installer/windows/moz.build | 1 - application/palemoon/locales/moz.build | 1 - application/palemoon/modules/moz.build | 1 - application/palemoon/moz.build | 1 - application/palemoon/moz.configure | 1 - application/palemoon/themes/linux/communicator/moz.build | 1 - application/palemoon/themes/linux/moz.build | 1 - application/palemoon/themes/moz.build | 1 - application/palemoon/themes/osx/communicator/moz.build | 1 - application/palemoon/themes/osx/moz.build | 1 - application/palemoon/themes/windows/communicator/moz.build | 1 - application/palemoon/themes/windows/moz.build | 1 - 49 files changed, 49 deletions(-) diff --git a/application/palemoon/app.mozbuild b/application/palemoon/app.mozbuild index 1727d4f6bf..6111330d47 100644 --- a/application/palemoon/app.mozbuild +++ b/application/palemoon/app.mozbuild @@ -1,4 +1,3 @@ -# 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build index d18e6fb846..8a4a534974 100644 --- a/application/palemoon/app/moz.build +++ b/application/palemoon/app/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/app/profile/extensions/moz.build b/application/palemoon/app/profile/extensions/moz.build index df43182059..bdf2353388 100644 --- a/application/palemoon/app/profile/extensions/moz.build +++ b/application/palemoon/app/profile/extensions/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/application/palemoon/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build index e14ac8e218..c96d19a09a 100644 --- a/application/palemoon/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build +++ b/application/palemoon/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/base/moz.build b/application/palemoon/base/moz.build index b0a696b3f6..dfa89c7d30 100644 --- a/application/palemoon/base/moz.build +++ b/application/palemoon/base/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/branding/unofficial/content/moz.build b/application/palemoon/branding/unofficial/content/moz.build index c97072bba2..ecb79e730d 100644 --- a/application/palemoon/branding/unofficial/content/moz.build +++ b/application/palemoon/branding/unofficial/content/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/branding/unofficial/locales/moz.build b/application/palemoon/branding/unofficial/locales/moz.build index 3a54c0cd24..0859b52af7 100644 --- a/application/palemoon/branding/unofficial/locales/moz.build +++ b/application/palemoon/branding/unofficial/locales/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/branding/unofficial/moz.build b/application/palemoon/branding/unofficial/moz.build index 8cb90130f8..ec3466b8f3 100644 --- a/application/palemoon/branding/unofficial/moz.build +++ b/application/palemoon/branding/unofficial/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/components/abouthome/moz.build b/application/palemoon/components/abouthome/moz.build index 2d64d506c1..8267a660d1 100644 --- a/application/palemoon/components/abouthome/moz.build +++ b/application/palemoon/components/abouthome/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/components/build/moz.build b/application/palemoon/components/build/moz.build index ea1f77163e..ebacbec8f3 100644 --- a/application/palemoon/components/build/moz.build +++ b/application/palemoon/components/build/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/components/certerror/moz.build b/application/palemoon/components/certerror/moz.build index c97072bba2..ecb79e730d 100644 --- a/application/palemoon/components/certerror/moz.build +++ b/application/palemoon/components/certerror/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/components/dirprovider/moz.build b/application/palemoon/components/dirprovider/moz.build index b01c4a3bcd..3f51743af5 100644 --- a/application/palemoon/components/dirprovider/moz.build +++ b/application/palemoon/components/dirprovider/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; c-basic-offset: 4; 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 # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm index 5d5aa4fcdb..53287e34e9 100644 --- a/application/palemoon/components/downloads/DownloadsCommon.jsm +++ b/application/palemoon/components/downloads/DownloadsCommon.jsm @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */ /* 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/application/palemoon/components/downloads/DownloadsLogger.jsm b/application/palemoon/components/downloads/DownloadsLogger.jsm index 833826ec08..845f1c91fc 100644 --- a/application/palemoon/components/downloads/DownloadsLogger.jsm +++ b/application/palemoon/components/downloads/DownloadsLogger.jsm @@ -1,5 +1,4 @@ /* -*- Mode: js2; js2-basic-offset: 2; indent-tabs-mode: nil; -*- */ -/* vim: set ft=javascript ts=2 et sw=2 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/application/palemoon/components/downloads/DownloadsStartup.js b/application/palemoon/components/downloads/DownloadsStartup.js index 8c0c40f2fe..363b9642c9 100644 --- a/application/palemoon/components/downloads/DownloadsStartup.js +++ b/application/palemoon/components/downloads/DownloadsStartup.js @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 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/application/palemoon/components/downloads/DownloadsTaskbar.jsm b/application/palemoon/components/downloads/DownloadsTaskbar.jsm index cf915abb58..e1b9f7a27d 100644 --- a/application/palemoon/components/downloads/DownloadsTaskbar.jsm +++ b/application/palemoon/components/downloads/DownloadsTaskbar.jsm @@ -1,5 +1,4 @@ /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */ /* 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/application/palemoon/components/downloads/DownloadsUI.js b/application/palemoon/components/downloads/DownloadsUI.js index 9686c2b780..e62bb81485 100644 --- a/application/palemoon/components/downloads/DownloadsUI.js +++ b/application/palemoon/components/downloads/DownloadsUI.js @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 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/application/palemoon/components/downloads/content/download.xml b/application/palemoon/components/downloads/content/download.xml index 542901bbff..a15f0e6f59 100644 --- a/application/palemoon/components/downloads/content/download.xml +++ b/application/palemoon/components/downloads/content/download.xml @@ -1,6 +1,5 @@ - - - -