From a680bdc637e0393aaa08d575c66f7166b788b443 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 13:55:00 +0000
Subject: Issue #1656 - Part 1: Nuke most vim config lines in the tree.

Since these are just interpreted comments, there's 0 impact on actual code.
This removes all lines that match /* vim: set(.*)tw=80: */ with S&R -- there are
a few others scattered around which will be removed manually in a second part.
---
 layout/generic/AspectRatio.h                |  1 -
 layout/generic/DetailsFrame.h               |  1 -
 layout/generic/JustificationUtils.h         |  1 -
 layout/generic/RubyUtils.cpp                |  1 -
 layout/generic/RubyUtils.h                  |  1 -
 layout/generic/Selection.h                  |  1 -
 layout/generic/StickyScrollContainer.cpp    |  1 -
 layout/generic/StickyScrollContainer.h      |  1 -
 layout/generic/nsAtomicContainerFrame.h     |  1 -
 layout/generic/nsFlexContainerFrame.cpp     |  3 +--
 layout/generic/nsFlexContainerFrame.h       |  1 -
 layout/generic/nsGridContainerFrame.cpp     | 17 ++++++++---------
 layout/generic/nsGridContainerFrame.h       |  1 -
 layout/generic/nsRubyBaseContainerFrame.cpp |  1 -
 layout/generic/nsRubyBaseContainerFrame.h   |  1 -
 layout/generic/nsRubyBaseFrame.cpp          |  1 -
 layout/generic/nsRubyBaseFrame.h            |  1 -
 layout/generic/nsRubyContentFrame.cpp       |  1 -
 layout/generic/nsRubyContentFrame.h         |  1 -
 layout/generic/nsRubyFrame.cpp              |  1 -
 layout/generic/nsRubyFrame.h                |  1 -
 layout/generic/nsRubyTextContainerFrame.cpp |  1 -
 layout/generic/nsRubyTextContainerFrame.h   |  1 -
 layout/generic/nsRubyTextFrame.cpp          |  1 -
 layout/generic/nsRubyTextFrame.h            |  1 -
 layout/generic/nsTextFrame.cpp              |  1 -
 26 files changed, 9 insertions(+), 35 deletions(-)

(limited to 'layout/generic')

diff --git a/layout/generic/AspectRatio.h b/layout/generic/AspectRatio.h
index 0056c0620..5cb281c80 100644
--- a/layout/generic/AspectRatio.h
+++ b/layout/generic/AspectRatio.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/DetailsFrame.h b/layout/generic/DetailsFrame.h
index 4ae177f16..cfaf4a6e4 100644
--- a/layout/generic/DetailsFrame.h
+++ b/layout/generic/DetailsFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/JustificationUtils.h b/layout/generic/JustificationUtils.h
index 1be36956b..1e8768acc 100644
--- a/layout/generic/JustificationUtils.h
+++ b/layout/generic/JustificationUtils.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/RubyUtils.cpp b/layout/generic/RubyUtils.cpp
index 05dd25413..80b00b0d9 100644
--- a/layout/generic/RubyUtils.cpp
+++ b/layout/generic/RubyUtils.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/RubyUtils.h b/layout/generic/RubyUtils.h
index 9bba89d0b..c717b8588 100644
--- a/layout/generic/RubyUtils.h
+++ b/layout/generic/RubyUtils.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/Selection.h b/layout/generic/Selection.h
index cc696a7c7..1e703b466 100644
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; 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/layout/generic/StickyScrollContainer.cpp b/layout/generic/StickyScrollContainer.cpp
index c5ed44e92..835937fa4 100644
--- a/layout/generic/StickyScrollContainer.cpp
+++ b/layout/generic/StickyScrollContainer.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sts=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/layout/generic/StickyScrollContainer.h b/layout/generic/StickyScrollContainer.h
index 1d26982a9..5d6d5b63e 100644
--- a/layout/generic/StickyScrollContainer.h
+++ b/layout/generic/StickyScrollContainer.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sts=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/layout/generic/nsAtomicContainerFrame.h b/layout/generic/nsAtomicContainerFrame.h
index 7acac86de..98a9855a3 100644
--- a/layout/generic/nsAtomicContainerFrame.h
+++ b/layout/generic/nsAtomicContainerFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index a03d777e7..635ae761b 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
@@ -1614,7 +1613,7 @@ ResolveAutoFlexBasisFromRatio(FlexItem& aFlexItem,
   //  - a [used] flex-basis of 'main-size' [auto?] [We have this, if we're here.]
   //  - a definite cross size
   // then the flex base size is calculated from its inner cross size and the
-  // flex item’s intrinsic aspect ratio.
+  // flex item???s intrinsic aspect ratio.
   if (aFlexItem.IntrinsicRatio()) {
     // We have a usable aspect ratio. (not going to divide by 0)
     const bool useMinSizeIfCrossSizeIsIndefinite = false;
diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
index ac2cc72f6..9edcb8797 100644
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index d7120d91e..1b767997e 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
@@ -1404,7 +1403,7 @@ struct nsGridContainerFrame::Tracks
                                  const LineRange&            aRange,
                                  const GridItemInfo&         aGridItem);
 
-  // Helper method that returns the track size to use in §11.5.1.2
+  // Helper method that returns the track size to use in ??11.5.1.2
   // https://drafts.csswg.org/css-grid/#extra-space
   template<TrackSizingPhase phase> static
   nscoord StartSizeInDistribution(const TrackSize& aSize)
@@ -1427,7 +1426,7 @@ struct nsGridContainerFrame::Tracks
   /**
    * Collect the tracks which are growable (matching aSelector) into
    * aGrowableTracks, and return the amount of space that can be used
-   * to grow those tracks.  This method implements CSS Grid §11.5.1.2.
+   * to grow those tracks.  This method implements CSS Grid ??11.5.1.2.
    * https://drafts.csswg.org/css-grid/#extra-space
    */
   template<TrackSizingPhase phase>
@@ -1538,7 +1537,7 @@ struct nsGridContainerFrame::Tracks
         nscoord limit = sz.mLimit;
         if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
                          aFitContentClamper)) {
-          // Clamp the limit to the fit-content() size, for §12.5.2 step 5/6.
+          // Clamp the limit to the fit-content() size, for ??12.5.2 step 5/6.
           aFitContentClamper(track, sz.mBase, &limit);
         }
         if (newBase > limit) {
@@ -1610,7 +1609,7 @@ struct nsGridContainerFrame::Tracks
 
   /**
    * Mark all tracks in aGrowableTracks with an eSkipGrowUnlimited bit if
-   * they *shouldn't* grow unlimited in §11.5.1.2.3 "Distribute space beyond
+   * they *shouldn't* grow unlimited in ??11.5.1.2.3 "Distribute space beyond
    * growth limits" https://drafts.csswg.org/css-grid/#extra-space
    * Return the number of tracks that are still growable.
    */
@@ -1672,7 +1671,7 @@ struct nsGridContainerFrame::Tracks
         nscoord newBase = sz.mBase + delta;
         if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
                          aFitContentClamper)) {
-          // Clamp newBase to the fit-content() size, for §12.5.2 step 5/6.
+          // Clamp newBase to the fit-content() size, for ??12.5.2 step 5/6.
           if (aFitContentClamper(track, sz.mBase, &newBase)) {
             didClamp = true;
             delta = newBase - sz.mBase;
@@ -4105,7 +4104,7 @@ nsGridContainerFrame::Tracks::ResolveIntrinsicSizeStep1(
       sz.mLimit = std::max(sz.mLimit, s);
     }
     if (MOZ_UNLIKELY(sz.mState & TrackSize::eFitContent)) {
-      // Clamp mLimit to the fit-content() size, for §12.5.1.
+      // Clamp mLimit to the fit-content() size, for ??12.5.1.
       auto maxCoord = aFunctions.MaxSizingFor(aRange.mStart);
       nscoord fitContentClamp =
         nsRuleNode::ComputeCoordPercentCalc(maxCoord, aPercentageBasis);
@@ -4846,8 +4845,8 @@ nsGridContainerFrame::Tracks::StretchFlexibleTracks(
       applyMinMax = false;
       // https://drafts.csswg.org/css-grid/#algo-flex-tracks
       // "If using this flex fraction would cause the grid to be smaller than
-      // the grid container’s min-width/height (or larger than the grid
-      // container’s max-width/height), then redo this step, treating the free
+      // the grid container???s min-width/height (or larger than the grid
+      // container???s max-width/height), then redo this step, treating the free
       // space as definite [...]"
       nscoord newSize = 0;
       for (auto& sz : mSizes) {
diff --git a/layout/generic/nsGridContainerFrame.h b/layout/generic/nsGridContainerFrame.h
index c9163b95c..1275305b6 100644
--- a/layout/generic/nsGridContainerFrame.h
+++ b/layout/generic/nsGridContainerFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseContainerFrame.cpp b/layout/generic/nsRubyBaseContainerFrame.cpp
index 566dee14f..91bbf5de8 100644
--- a/layout/generic/nsRubyBaseContainerFrame.cpp
+++ b/layout/generic/nsRubyBaseContainerFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseContainerFrame.h b/layout/generic/nsRubyBaseContainerFrame.h
index 7e8c449d3..8428788f2 100644
--- a/layout/generic/nsRubyBaseContainerFrame.h
+++ b/layout/generic/nsRubyBaseContainerFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseFrame.cpp b/layout/generic/nsRubyBaseFrame.cpp
index 668bf77fd..35dff0961 100644
--- a/layout/generic/nsRubyBaseFrame.cpp
+++ b/layout/generic/nsRubyBaseFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseFrame.h b/layout/generic/nsRubyBaseFrame.h
index b6dde1029..ed66a4079 100644
--- a/layout/generic/nsRubyBaseFrame.h
+++ b/layout/generic/nsRubyBaseFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyContentFrame.cpp b/layout/generic/nsRubyContentFrame.cpp
index c7f0774bb..62c37676b 100644
--- a/layout/generic/nsRubyContentFrame.cpp
+++ b/layout/generic/nsRubyContentFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyContentFrame.h b/layout/generic/nsRubyContentFrame.h
index 05f8a566d..91a20ac9f 100644
--- a/layout/generic/nsRubyContentFrame.h
+++ b/layout/generic/nsRubyContentFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyFrame.cpp b/layout/generic/nsRubyFrame.cpp
index 31e0e2277..797b00fcf 100644
--- a/layout/generic/nsRubyFrame.cpp
+++ b/layout/generic/nsRubyFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyFrame.h b/layout/generic/nsRubyFrame.h
index c1fc7a303..0f9d16714 100644
--- a/layout/generic/nsRubyFrame.h
+++ b/layout/generic/nsRubyFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextContainerFrame.cpp b/layout/generic/nsRubyTextContainerFrame.cpp
index e91f1151f..29bb65605 100644
--- a/layout/generic/nsRubyTextContainerFrame.cpp
+++ b/layout/generic/nsRubyTextContainerFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextContainerFrame.h b/layout/generic/nsRubyTextContainerFrame.h
index 1ce93db9b..4c6044527 100644
--- a/layout/generic/nsRubyTextContainerFrame.h
+++ b/layout/generic/nsRubyTextContainerFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextFrame.cpp b/layout/generic/nsRubyTextFrame.cpp
index 2848cb6fc..15c0e3439 100644
--- a/layout/generic/nsRubyTextFrame.cpp
+++ b/layout/generic/nsRubyTextFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextFrame.h b/layout/generic/nsRubyTextFrame.h
index 83c24d49d..c1d65ad41 100644
--- a/layout/generic/nsRubyTextFrame.h
+++ b/layout/generic/nsRubyTextFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index e2a629a07..ec1034204 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/. */
-- 
cgit v1.2.3


From 7572f371867ac8fd61963aced41382357d0e28f8 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 14:52:16 +0000
Subject: Issue #1656 - Part 2: Unmangle some unfortunate UTF-8 victims.

The poor fellows got lost in an ASCII-interpretation of the world.
---
 layout/generic/nsGridContainerFrame.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'layout/generic')

diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index 1b767997e..0af05be50 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -1403,7 +1403,7 @@ struct nsGridContainerFrame::Tracks
                                  const LineRange&            aRange,
                                  const GridItemInfo&         aGridItem);
 
-  // Helper method that returns the track size to use in ??11.5.1.2
+  // Helper method that returns the track size to use in §11.5.1.2
   // https://drafts.csswg.org/css-grid/#extra-space
   template<TrackSizingPhase phase> static
   nscoord StartSizeInDistribution(const TrackSize& aSize)
@@ -1426,7 +1426,7 @@ struct nsGridContainerFrame::Tracks
   /**
    * Collect the tracks which are growable (matching aSelector) into
    * aGrowableTracks, and return the amount of space that can be used
-   * to grow those tracks.  This method implements CSS Grid ??11.5.1.2.
+   * to grow those tracks.  This method implements CSS Grid §11.5.1.2.
    * https://drafts.csswg.org/css-grid/#extra-space
    */
   template<TrackSizingPhase phase>
@@ -1537,7 +1537,7 @@ struct nsGridContainerFrame::Tracks
         nscoord limit = sz.mLimit;
         if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
                          aFitContentClamper)) {
-          // Clamp the limit to the fit-content() size, for ??12.5.2 step 5/6.
+          // Clamp the limit to the fit-content() size, for §12.5.2 step 5/6.
           aFitContentClamper(track, sz.mBase, &limit);
         }
         if (newBase > limit) {
@@ -1609,7 +1609,7 @@ struct nsGridContainerFrame::Tracks
 
   /**
    * Mark all tracks in aGrowableTracks with an eSkipGrowUnlimited bit if
-   * they *shouldn't* grow unlimited in ??11.5.1.2.3 "Distribute space beyond
+   * they *shouldn't* grow unlimited in §11.5.1.2.3 "Distribute space beyond
    * growth limits" https://drafts.csswg.org/css-grid/#extra-space
    * Return the number of tracks that are still growable.
    */
@@ -1671,7 +1671,7 @@ struct nsGridContainerFrame::Tracks
         nscoord newBase = sz.mBase + delta;
         if (MOZ_UNLIKELY((sz.mState & TrackSize::eFitContent) &&
                          aFitContentClamper)) {
-          // Clamp newBase to the fit-content() size, for ??12.5.2 step 5/6.
+          // Clamp newBase to the fit-content() size, for §12.5.2 step 5/6.
           if (aFitContentClamper(track, sz.mBase, &newBase)) {
             didClamp = true;
             delta = newBase - sz.mBase;
@@ -4104,7 +4104,7 @@ nsGridContainerFrame::Tracks::ResolveIntrinsicSizeStep1(
       sz.mLimit = std::max(sz.mLimit, s);
     }
     if (MOZ_UNLIKELY(sz.mState & TrackSize::eFitContent)) {
-      // Clamp mLimit to the fit-content() size, for ??12.5.1.
+      // Clamp mLimit to the fit-content() size, for §12.5.1.
       auto maxCoord = aFunctions.MaxSizingFor(aRange.mStart);
       nscoord fitContentClamp =
         nsRuleNode::ComputeCoordPercentCalc(maxCoord, aPercentageBasis);
@@ -4845,8 +4845,8 @@ nsGridContainerFrame::Tracks::StretchFlexibleTracks(
       applyMinMax = false;
       // https://drafts.csswg.org/css-grid/#algo-flex-tracks
       // "If using this flex fraction would cause the grid to be smaller than
-      // the grid container???s min-width/height (or larger than the grid
-      // container???s max-width/height), then redo this step, treating the free
+      // the grid container’s min-width/height (or larger than the grid
+      // container’s max-width/height), then redo this step, treating the free
       // space as definite [...]"
       nscoord newSize = 0;
       for (auto& sz : mSizes) {
-- 
cgit v1.2.3


From 5d97621bb92efe01b05834abc43c40016d9cf078 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 14:57:31 +0000
Subject: Issue #1656 - Part 2b: Unmangle one more lost little UTF-8 victim.

---
 layout/generic/nsFlexContainerFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layout/generic')

diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index 635ae761b..8a393c3fe 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1613,7 +1613,7 @@ ResolveAutoFlexBasisFromRatio(FlexItem& aFlexItem,
   //  - a [used] flex-basis of 'main-size' [auto?] [We have this, if we're here.]
   //  - a definite cross size
   // then the flex base size is calculated from its inner cross size and the
-  // flex item???s intrinsic aspect ratio.
+  // flex item’s intrinsic aspect ratio.
   if (aFlexItem.IntrinsicRatio()) {
     // We have a usable aspect ratio. (not going to divide by 0)
     const bool useMinSizeIfCrossSizeIsIndefinite = false;
-- 
cgit v1.2.3


From 528b88d7048728c70227817ab59223e329171d15 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 15:14:30 +0000
Subject: Issue #1656 - Part 3: Nuke more vim config lines in the tree.

Another S&R run with some smarter matching.
---
 layout/generic/FrameChildList.cpp      | 1 -
 layout/generic/FrameChildList.h        | 1 -
 layout/generic/ScrollVelocityQueue.cpp | 1 -
 layout/generic/ScrollVelocityQueue.h   | 1 -
 layout/generic/TextOverflow.cpp        | 1 -
 layout/generic/TextOverflow.h          | 1 -
 layout/generic/nsDirection.h           | 1 -
 layout/generic/nsIFrame.h              | 1 -
 layout/generic/nsIFrameInlines.h       | 1 -
 layout/generic/nsSelection.cpp         | 1 -
 10 files changed, 10 deletions(-)

(limited to 'layout/generic')

diff --git a/layout/generic/FrameChildList.cpp b/layout/generic/FrameChildList.cpp
index 1d2fe25c0..f670f2481 100644
--- a/layout/generic/FrameChildList.cpp
+++ b/layout/generic/FrameChildList.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/FrameChildList.h b/layout/generic/FrameChildList.h
index 8ccfa2ff8..ee75c74e9 100644
--- a/layout/generic/FrameChildList.h
+++ b/layout/generic/FrameChildList.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/ScrollVelocityQueue.cpp b/layout/generic/ScrollVelocityQueue.cpp
index 820e6cb5c..2ba019044 100644
--- a/layout/generic/ScrollVelocityQueue.cpp
+++ b/layout/generic/ScrollVelocityQueue.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/ScrollVelocityQueue.h b/layout/generic/ScrollVelocityQueue.h
index ca0e5a83a..0da2dd835 100644
--- a/layout/generic/ScrollVelocityQueue.h
+++ b/layout/generic/ScrollVelocityQueue.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
index b4d935fbf..f4db27766 100644
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/TextOverflow.h b/layout/generic/TextOverflow.h
index 835b35be1..5c20ba68c 100644
--- a/layout/generic/TextOverflow.h
+++ b/layout/generic/TextOverflow.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/nsDirection.h b/layout/generic/nsDirection.h
index 07c4ab07a..a786ba6d4 100644
--- a/layout/generic/nsDirection.h
+++ b/layout/generic/nsDirection.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
 /* 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/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index d54ddc2b5..bc5a5fe97 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
 /* 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/generic/nsIFrameInlines.h b/layout/generic/nsIFrameInlines.h
index a3da7ebca..b5b0b481a 100644
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
 /* 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/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 919ab0815..ba7f48403 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
 /* 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/. */
-- 
cgit v1.2.3


From 7523b9ea042af1078c49ed242b5d9eb3e0f34af5 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 15:37:46 +0000
Subject: Issue #1656 - Part 4: Manual cleanup

---
 layout/generic/ReflowOutput.cpp        | 1 -
 layout/generic/nsFontInflationData.cpp | 1 -
 layout/generic/nsFontInflationData.h   | 1 -
 3 files changed, 3 deletions(-)

(limited to 'layout/generic')

diff --git a/layout/generic/ReflowOutput.cpp b/layout/generic/ReflowOutput.cpp
index 1c61484e7..bfe9e8258 100644
--- a/layout/generic/ReflowOutput.cpp
+++ b/layout/generic/ReflowOutput.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/nsFontInflationData.cpp b/layout/generic/nsFontInflationData.cpp
index 831658c9e..2e3c704c7 100644
--- a/layout/generic/nsFontInflationData.cpp
+++ b/layout/generic/nsFontInflationData.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/generic/nsFontInflationData.h b/layout/generic/nsFontInflationData.h
index e8c457620..627f34cbb 100644
--- a/layout/generic/nsFontInflationData.h
+++ b/layout/generic/nsFontInflationData.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent 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/. */
-- 
cgit v1.2.3


From d5a2c45aad51e3fcf5f48f8afe8609c1e8726a02 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 23 Sep 2020 15:52:00 +0000
Subject: Issue #1656 - Part 6: Clean up the build files

---
 layout/generic/moz.build | 1 -
 1 file changed, 1 deletion(-)

(limited to 'layout/generic')

diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index b830470a3..199b3c679 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-- 
cgit v1.2.3


From 8e18743ab871bed1e1858ed2714a81f017433a2d Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 3 Oct 2020 12:45:27 +0000
Subject: Issue #1665 - Take overflow-wrap into account when calculating
 min-content intrinsic size.

---
 layout/generic/nsTextFrame.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'layout/generic')

diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index ec1034204..9cf152873 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -8243,6 +8243,16 @@ nsTextFrame::AddInlineMinISizeForFlow(nsRenderingContext *aRenderingContext,
     return;
   }
 
+  // If overflow-wrap is break-word, we can wrap everywhere.
+  if (textStyle->WordCanWrap(this)) {
+    aData->OptionallyBreak();
+    aData->mCurrentLine +=
+      textRun->GetMinAdvanceWidth(Range(start, flowEndInTextRun));
+    aData->mTrailingWhitespace = 0;
+    aData->OptionallyBreak();
+    return;
+  }
+
   AutoTArray<bool,BIG_TEXT_NODE_SIZE> hyphBuffer;
   bool *hyphBreakBefore = nullptr;
   if (hyphenating) {
-- 
cgit v1.2.3


From dadef50bdc3c6b546aad9e3231943e41ad3ccb97 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 3 Oct 2020 14:52:47 +0000
Subject: Issue #1666 - Implement overflow-wrap: anywhere
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This aligns with the current spec regarding overflow-wrap: break-word and
overflow-wrap: anywhere in if it affects intrinsic sized due to considering
soft-wrap opportunities or not.
See CSS Text Module Level 3, Editor’s Draft, 1 October 2020, Section 5.5
---
 layout/generic/nsTextFrame.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'layout/generic')

diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 9cf152873..fcce7f3f6 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -8243,8 +8243,9 @@ nsTextFrame::AddInlineMinISizeForFlow(nsRenderingContext *aRenderingContext,
     return;
   }
 
-  // If overflow-wrap is break-word, we can wrap everywhere.
-  if (textStyle->WordCanWrap(this)) {
+  // If overflow-wrap is 'anywhere', we can wrap everywhere.
+  if (textStyle->mOverflowWrap == NS_STYLE_OVERFLOWWRAP_ANYWHERE &&
+      textStyle->WordCanWrap(this)) {
     aData->OptionallyBreak();
     aData->mCurrentLine +=
       textRun->GetMinAdvanceWidth(Range(start, flowEndInTextRun));
-- 
cgit v1.2.3