From 6bd74b145e896e97712982d98bd48223e240088f Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 30 Apr 2020 21:45:28 +0000
Subject: Issue mcp-graveyard/UXP#80 - De-unify layout/tables

---
 layout/tables/FixedTableLayoutStrategy.cpp | 4 ++++
 layout/tables/SpanningCellSorter.cpp       | 2 ++
 layout/tables/moz.build                    | 2 +-
 layout/tables/nsTableFrame.cpp             | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'layout')

diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp
index 4277657958..d69946a334 100644
--- a/layout/tables/FixedTableLayoutStrategy.cpp
+++ b/layout/tables/FixedTableLayoutStrategy.cpp
@@ -15,6 +15,10 @@
 #include "nsTableCellFrame.h"
 #include <algorithm>
 
+#include "mozilla/WritingModes.h"
+
+using namespace mozilla;
+
 FixedTableLayoutStrategy::FixedTableLayoutStrategy(nsTableFrame *aTableFrame)
   : nsITableLayoutStrategy(nsITableLayoutStrategy::Fixed)
   , mTableFrame(aTableFrame)
diff --git a/layout/tables/SpanningCellSorter.cpp b/layout/tables/SpanningCellSorter.cpp
index c67d784bba..686b02d89b 100644
--- a/layout/tables/SpanningCellSorter.cpp
+++ b/layout/tables/SpanningCellSorter.cpp
@@ -12,6 +12,8 @@
 #include "nsQuickSort.h"
 #include "nsIPresShell.h"
 
+using mozilla::fallible;
+
 //#define DEBUG_SPANNING_CELL_SORTER
 
 SpanningCellSorter::SpanningCellSorter()
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index e28e21ee0a..554ffebec8 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -13,7 +13,7 @@ EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
     'nsCellMap.cpp',
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index e5a48139a0..648fa7ddf7 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -41,6 +41,7 @@
 #include "nsCSSFrameConstructor.h"
 #include "mozilla/StyleSetHandle.h"
 #include "mozilla/StyleSetHandleInlines.h"
+#include "mozilla/gfx/Helpers.h"
 #include "nsDisplayList.h"
 #include "nsIScrollableFrame.h"
 #include "nsCSSProps.h"
@@ -48,6 +49,7 @@
 #include <algorithm>
 
 using namespace mozilla;
+using namespace mozilla::gfx;
 using namespace mozilla::image;
 using namespace mozilla::layout;
 
-- 
cgit v1.2.3