summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-18 13:10:09 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-24 10:32:36 +0200
commitf5316668a3481955a6141a98c35200cd496b01cf (patch)
treee775e8cf9e2f1e9dd973e4b7c6bd6b0a3c1a4494
parentdc687dbc0b43bcff9566b135f95d54b28e68bde9 (diff)
downloadUXP-f5316668a3481955a6141a98c35200cd496b01cf.tar
UXP-f5316668a3481955a6141a98c35200cd496b01cf.tar.gz
UXP-f5316668a3481955a6141a98c35200cd496b01cf.tar.lz
UXP-f5316668a3481955a6141a98c35200cd496b01cf.tar.xz
UXP-f5316668a3481955a6141a98c35200cd496b01cf.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 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)