From fd1e35f8d507f22f3fff546004ebaaa145c47d90 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 20 Apr 2020 19:35:13 +0200
Subject: Issue #80 - De-unify dom/grid

---
 dom/grid/GridDimension.h | 2 ++
 dom/grid/GridLines.cpp   | 1 +
 dom/grid/GridLines.h     | 7 ++++++-
 dom/grid/moz.build       | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dom/grid/GridDimension.h b/dom/grid/GridDimension.h
index 7a3373521..ec9635444 100644
--- a/dom/grid/GridDimension.h
+++ b/dom/grid/GridDimension.h
@@ -7,11 +7,13 @@
 #ifndef mozilla_dom_GridDimension_h
 #define mozilla_dom_GridDimension_h
 
+#include "mozilla/dom/GridBinding.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 
 struct ComputedGridTrackInfo;
+struct ComputedGridLineInfo;
 
 namespace dom {
 
diff --git a/dom/grid/GridLines.cpp b/dom/grid/GridLines.cpp
index 898885346..2604eff6c 100644
--- a/dom/grid/GridLines.cpp
+++ b/dom/grid/GridLines.cpp
@@ -6,6 +6,7 @@
 
 #include "GridLines.h"
 
+#include "GridArea.h"
 #include "GridDimension.h"
 #include "GridLine.h"
 #include "mozilla/dom/GridBinding.h"
diff --git a/dom/grid/GridLines.h b/dom/grid/GridLines.h
index 921168204..784fe2d28 100644
--- a/dom/grid/GridLines.h
+++ b/dom/grid/GridLines.h
@@ -7,10 +7,15 @@
 #ifndef mozilla_dom_GridLines_h
 #define mozilla_dom_GridLines_h
 
-#include "nsTArray.h"
+#include "mozilla/dom/GridBinding.h"
+#include "nsGridContainerFrame.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+
+struct ComputedGridTrackInfo;
+struct ComputedGridLineInfo;
+
 namespace dom {
 
 class GridDimension;
diff --git a/dom/grid/moz.build b/dom/grid/moz.build
index 96d5c3151..62025c98e 100644
--- a/dom/grid/moz.build
+++ b/dom/grid/moz.build
@@ -16,7 +16,7 @@ EXPORTS.mozilla.dom += [
     'GridTracks.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'Grid.cpp',
     'GridArea.cpp',
     'GridDimension.cpp',
-- 
cgit v1.2.3