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/forms | |
| parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
| parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
| download | UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.gz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.lz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.xz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.zip | |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'layout/forms')
| -rw-r--r-- | layout/forms/moz.build | 2 | ||||
| -rw-r--r-- | layout/forms/nsHTMLButtonControlFrame.cpp | 1 | ||||
| -rw-r--r-- | layout/forms/nsLegendFrame.cpp | 2 | ||||
| -rw-r--r-- | layout/forms/nsTextControlFrame.cpp | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 4fecbad38..50e364ce2 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -18,7 +18,7 @@ EXPORTS += [ 'nsITextControlFrame.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsButtonFrameRenderer.cpp', 'nsColorControlFrame.cpp', 'nsComboboxControlFrame.cpp', diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index 2e4fa9f67..c6d8e1c4f 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -7,6 +7,7 @@ #include "nsContainerFrame.h" #include "nsIFormControlFrame.h" +#include "nsIFrameInlines.h" #include "nsPresContext.h" #include "nsGkAtoms.h" #include "nsButtonFrameRenderer.h" diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp index 60056f15d..95efc2c87 100644 --- a/layout/forms/nsLegendFrame.cpp +++ b/layout/forms/nsLegendFrame.cpp @@ -12,6 +12,8 @@ #include "nsStyleConsts.h" #include "nsFormControlFrame.h" +using namespace mozilla; + nsIFrame* NS_NewLegendFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) { diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index f8fdf3420..a65e5b972 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -55,6 +55,7 @@ #define DEFAULT_COLUMN_WIDTH 20 using namespace mozilla; +using namespace mozilla::dom; nsIFrame* NS_NewTextControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) |