summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-30 21:45:28 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-05-06 19:12:37 +0200
commit157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338 (patch)
tree24cf9164545f779fdc93cd8e0dbbeff4c78bf36a
parent5c3c92da90eb339c8f65f0fea43fb595684455ae (diff)
downloadUXP-157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338.tar
UXP-157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338.tar.gz
UXP-157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338.tar.lz
UXP-157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338.tar.xz
UXP-157cd64a8efd0d9ed7a39004aafdb1e1e5e4c338.zip
Issue #80 - De-unify layout/tables
-rw-r--r--layout/tables/FixedTableLayoutStrategy.cpp4
-rw-r--r--layout/tables/SpanningCellSorter.cpp2
-rw-r--r--layout/tables/moz.build2
-rw-r--r--layout/tables/nsTableFrame.cpp2
4 files changed, 9 insertions, 1 deletions
diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp
index 427765795..d69946a33 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 c67d784bb..686b02d89 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 e28e21ee0..554ffebec 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 e5a48139a..648fa7ddf 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;