summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-30 22:30:35 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-05-06 19:12:48 +0200
commite733c3681b03436a43c20cfda2db1d2c79591640 (patch)
tree4515d0ac6f25e036306350f77c662a7d1cd9a9f9
parent157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338 (diff)
downloadUXP-e733c3681b03436a43c20cfda2db1d2c79591640.tar
UXP-e733c3681b03436a43c20cfda2db1d2c79591640.tar.gz
UXP-e733c3681b03436a43c20cfda2db1d2c79591640.tar.lz
UXP-e733c3681b03436a43c20cfda2db1d2c79591640.tar.xz
UXP-e733c3681b03436a43c20cfda2db1d2c79591640.zip
Issue #80 - De-unify layout/xul and tree, grid
-rw-r--r--layout/xul/ContainerBoxObject.h1
-rw-r--r--layout/xul/grid/moz.build2
-rw-r--r--layout/xul/moz.build4
-rw-r--r--layout/xul/nsButtonBoxFrame.cpp1
-rw-r--r--layout/xul/nsMenuBarListener.cpp1
-rw-r--r--layout/xul/nsMenuFrame.cpp1
-rw-r--r--layout/xul/nsMenuPopupFrame.cpp3
-rw-r--r--layout/xul/nsResizerFrame.h3
-rw-r--r--layout/xul/tree/moz.build2
9 files changed, 14 insertions, 4 deletions
diff --git a/layout/xul/ContainerBoxObject.h b/layout/xul/ContainerBoxObject.h
index b3da97991..d9da164ea 100644
--- a/layout/xul/ContainerBoxObject.h
+++ b/layout/xul/ContainerBoxObject.h
@@ -8,6 +8,7 @@
#define mozilla_dom_ContainerBoxObject_h
#include "mozilla/dom/BoxObject.h"
+#include "nsIDocShell.h"
namespace mozilla {
namespace dom {
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 074985aaf..049489ab2 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -19,7 +19,7 @@ EXPORTS += [
'nsIGridPart.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'nsGrid.cpp',
'nsGridCell.cpp',
'nsGridLayout2.cpp',
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index 8ed304c9f..18b120b34 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -44,7 +44,7 @@ EXPORTS.mozilla.dom += [
'ScrollBoxObject.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'BoxObject.cpp',
'nsBox.cpp',
'nsBoxFrame.cpp',
@@ -64,7 +64,7 @@ UNIFIED_SOURCES += [
]
if CONFIG['MOZ_XUL']:
- UNIFIED_SOURCES += [
+ SOURCES += [
'ContainerBoxObject.cpp',
'ListBoxObject.cpp',
'MenuBoxObject.cpp',
diff --git a/layout/xul/nsButtonBoxFrame.cpp b/layout/xul/nsButtonBoxFrame.cpp
index 45d934516..e69c91929 100644
--- a/layout/xul/nsButtonBoxFrame.cpp
+++ b/layout/xul/nsButtonBoxFrame.cpp
@@ -12,6 +12,7 @@
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIDOMElement.h"
+#include "nsIDOMEvent.h"
#include "nsDisplayList.h"
#include "nsContentUtils.h"
#include "mozilla/dom/Element.h"
diff --git a/layout/xul/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp
index 0fce497b8..23df81937 100644
--- a/layout/xul/nsMenuBarListener.cpp
+++ b/layout/xul/nsMenuBarListener.cpp
@@ -21,6 +21,7 @@
#include "mozilla/BasicEvents.h"
#include "mozilla/Preferences.h"
#include "mozilla/TextEvents.h"
+#include "mozilla/dom/Event.h"
using namespace mozilla;
diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp
index 67fcdbe43..cb12dfc0a 100644
--- a/layout/xul/nsMenuFrame.cpp
+++ b/layout/xul/nsMenuFrame.cpp
@@ -48,6 +48,7 @@
#include <algorithm>
using namespace mozilla;
+using namespace mozilla::dom;
#define NS_MENU_POPUP_LIST_INDEX 0
diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
index 6e706e49c..3f934b208 100644
--- a/layout/xul/nsMenuPopupFrame.cpp
+++ b/layout/xul/nsMenuPopupFrame.cpp
@@ -18,6 +18,7 @@
#include "nsMenuBarFrame.h"
#include "nsPopupSetFrame.h"
#include "nsPIDOMWindow.h"
+#include "nsIDOMEvent.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDOMScreen.h"
#include "nsIPresShell.h"
@@ -45,6 +46,7 @@
#include "nsThemeConstants.h"
#include "nsTransitionManager.h"
#include "nsDisplayList.h"
+#include "nsIDOMXULMenuListElement.h"
#include "nsIDOMXULSelectCntrlItemEl.h"
#include "mozilla/EventDispatcher.h"
#include "mozilla/EventStateManager.h"
@@ -53,6 +55,7 @@
#include "mozilla/LookAndFeel.h"
#include "mozilla/MouseEvents.h"
#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
#include "mozilla/dom/PopupBoxObject.h"
#include <algorithm>
diff --git a/layout/xul/nsResizerFrame.h b/layout/xul/nsResizerFrame.h
index 92656bc76..41efa79a7 100644
--- a/layout/xul/nsResizerFrame.h
+++ b/layout/xul/nsResizerFrame.h
@@ -8,9 +8,12 @@
#include "mozilla/Attributes.h"
#include "mozilla/EventForwards.h"
#include "nsTitleBarFrame.h"
+#include "Units.h"
class nsIBaseWindow;
+using namespace mozilla;
+
class nsResizerFrame : public nsTitleBarFrame
{
protected:
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index ccac5bde9..7d150881a 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -27,7 +27,7 @@ EXPORTS.mozilla.dom += [
'TreeBoxObject.h'
]
-UNIFIED_SOURCES += [
+SOURCES += [
'nsTreeBodyFrame.cpp',
'nsTreeColFrame.cpp',
'nsTreeColumns.cpp',