summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-18 13:10:09 -0400
committerMatt A. Tobin <email@mattatobin.com>2020-04-18 13:10:09 -0400
commite43694dedbf6f886e1058c75a5f9032394a946c2 (patch)
treee98af9a05811cb9c0f20e39596c4bd673865e329
parent79f126e542d12ba62db70c1db0e0fb0607c2f7bb (diff)
downloadUXP-e43694dedbf6f886e1058c75a5f9032394a946c2.tar
UXP-e43694dedbf6f886e1058c75a5f9032394a946c2.tar.gz
UXP-e43694dedbf6f886e1058c75a5f9032394a946c2.tar.lz
UXP-e43694dedbf6f886e1058c75a5f9032394a946c2.tar.xz
UXP-e43694dedbf6f886e1058c75a5f9032394a946c2.zip
Issue #80 - De-unify layout/forms
-rw-r--r--layout/forms/moz.build2
-rw-r--r--layout/forms/nsHTMLButtonControlFrame.cpp1
-rw-r--r--layout/forms/nsLegendFrame.cpp2
-rw-r--r--layout/forms/nsTextControlFrame.cpp1
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 b34e132e6..465ef0883 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)