diff options
author | Moonchild <moonchild@palemoon.org> | 2020-02-07 09:52:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-07 09:52:57 +0100 |
commit | a6ef90b1830e263fefda7bcb6e7b74464044a678 (patch) | |
tree | 85fc59a89d370d98e2c132e2b4b77343eb507ff0 /layout/tables/celldata.h | |
parent | 99aa809cb850a19d09cb7fc3b92899085b4b447e (diff) | |
parent | 3a7d5d01cccf6abb3b83db8cf31ca213724f3ee7 (diff) | |
download | UXP-a6ef90b1830e263fefda7bcb6e7b74464044a678.tar UXP-a6ef90b1830e263fefda7bcb6e7b74464044a678.tar.gz UXP-a6ef90b1830e263fefda7bcb6e7b74464044a678.tar.lz UXP-a6ef90b1830e263fefda7bcb6e7b74464044a678.tar.xz UXP-a6ef90b1830e263fefda7bcb6e7b74464044a678.zip |
Merge pull request #1388 from win7-7/devirtualize-pr
Merging this in even without a test performed since the code change looks sane. real-world testing will have to be performed.
Diffstat (limited to 'layout/tables/celldata.h')
-rw-r--r-- | layout/tables/celldata.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/layout/tables/celldata.h b/layout/tables/celldata.h index b744b5175..ac7be58d7 100644 --- a/layout/tables/celldata.h +++ b/layout/tables/celldata.h @@ -6,6 +6,7 @@ #define CellData_h__ #include "nsISupports.h" +#include "nsITableCellLayout.h" // for MAX_COLSPAN / MAX_ROWSPAN #include "nsCoord.h" #include "mozilla/gfx/Types.h" #include "mozilla/WritingModes.h" @@ -15,11 +16,6 @@ class nsTableCellFrame; class nsCellMap; class BCCellData; - -#define MAX_ROWSPAN 65534 // the cellmap can not handle more. -#define MAX_COLSPAN 1000 // limit as IE and opera do. If this ever changes, - // change COL_SPAN_OFFSET/COL_SPAN_SHIFT accordingly. - /** * Data stored by nsCellMap to rationalize rowspan and colspan cells. */ |