From f5316668a3481955a6141a98c35200cd496b01cf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 13:10:09 -0400 Subject: Issue #80 - De-unify layout/forms --- layout/forms/moz.build | 2 +- layout/forms/nsHTMLButtonControlFrame.cpp | 1 + layout/forms/nsLegendFrame.cpp | 2 ++ layout/forms/nsTextControlFrame.cpp | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'layout') 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) -- cgit v1.2.3