diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
commit | 98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch) | |
tree | 0e269a27661fea619ab07a533e0c1fa195c3c671 /layout/mathml | |
parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
download | UXP-RELBASE_20200426.tar UXP-RELBASE_20200426.tar.gz UXP-RELBASE_20200426.tar.lz UXP-RELBASE_20200426.tar.xz UXP-RELBASE_20200426.zip |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'layout/mathml')
-rw-r--r-- | layout/mathml/moz.build | 2 | ||||
-rw-r--r-- | layout/mathml/nsMathMLOperators.cpp | 1 | ||||
-rw-r--r-- | layout/mathml/nsMathMLmfencedFrame.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index f40b2c2c6..07dd446a3 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -16,7 +16,7 @@ if CONFIG['ENABLE_TESTS']: 'tests/chrome.ini', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsMathMLChar.cpp', 'nsMathMLContainerFrame.cpp', 'nsMathMLFrame.cpp', diff --git a/layout/mathml/nsMathMLOperators.cpp b/layout/mathml/nsMathMLOperators.cpp index bbb03014b..9a9f413b4 100644 --- a/layout/mathml/nsMathMLOperators.cpp +++ b/layout/mathml/nsMathMLOperators.cpp @@ -7,6 +7,7 @@ #include "nsCOMPtr.h" #include "nsDataHashtable.h" #include "nsHashKeys.h" +#include "nsNetUtil.h" #include "nsTArray.h" #include "nsIPersistentProperties2.h" diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp index ca780e649..a5f5ed4d9 100644 --- a/layout/mathml/nsMathMLmfencedFrame.cpp +++ b/layout/mathml/nsMathMLmfencedFrame.cpp @@ -3,13 +3,13 @@ * 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/. */ - #include "nsMathMLmfencedFrame.h" #include "nsRenderingContext.h" #include "nsMathMLChar.h" #include <algorithm> using namespace mozilla; +using namespace mozilla::gfx; // // <mfenced> -- surround content with a pair of fences |