diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
| commit | 98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch) | |
| tree | 0e269a27661fea619ab07a533e0c1fa195c3c671 /dom/grid | |
| parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
| parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
| download | UXP-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.tar UXP-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.tar.gz UXP-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.tar.lz UXP-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.tar.xz UXP-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.zip | |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/grid')
| -rw-r--r-- | dom/grid/GridDimension.h | 2 | ||||
| -rw-r--r-- | dom/grid/GridLines.cpp | 1 | ||||
| -rw-r--r-- | dom/grid/GridLines.h | 7 | ||||
| -rw-r--r-- | 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', |