diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-11-05 11:36:03 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-05 11:36:03 -0500 |
commit | 714afc76f690ba11e77330e067e5bce486292831 (patch) | |
tree | 90b50f1ac6ab3cbf9e751a184bc1df8f8dafd730 /layout/base/nsDisplayItemTypesList.h | |
parent | 711a5031d015a9fde7feb61905473b52d9cc3369 (diff) | |
parent | 082670ecb19a229ea20bf9b69991341d4be25e38 (diff) | |
download | UXP-714afc76f690ba11e77330e067e5bce486292831.tar UXP-714afc76f690ba11e77330e067e5bce486292831.tar.gz UXP-714afc76f690ba11e77330e067e5bce486292831.tar.lz UXP-714afc76f690ba11e77330e067e5bce486292831.tar.xz UXP-714afc76f690ba11e77330e067e5bce486292831.zip |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'layout/base/nsDisplayItemTypesList.h')
-rw-r--r-- | layout/base/nsDisplayItemTypesList.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/layout/base/nsDisplayItemTypesList.h b/layout/base/nsDisplayItemTypesList.h index 9865395a7..cf809817f 100644 --- a/layout/base/nsDisplayItemTypesList.h +++ b/layout/base/nsDisplayItemTypesList.h @@ -56,9 +56,7 @@ DECLARE_DISPLAY_ITEM_TYPE(SVG_PATH_GEOMETRY) DECLARE_DISPLAY_ITEM_TYPE(SVG_TEXT) DECLARE_DISPLAY_ITEM_TYPE(TABLE_CELL_BACKGROUND) DECLARE_DISPLAY_ITEM_TYPE(TABLE_CELL_SELECTION) -DECLARE_DISPLAY_ITEM_TYPE(TABLE_ROW_BACKGROUND) -DECLARE_DISPLAY_ITEM_TYPE(TABLE_ROW_GROUP_BACKGROUND) -DECLARE_DISPLAY_ITEM_TYPE(TABLE_BORDER_BACKGROUND) +DECLARE_DISPLAY_ITEM_TYPE(TABLE_BORDER_COLLAPSE) DECLARE_DISPLAY_ITEM_TYPE(TEXT) DECLARE_DISPLAY_ITEM_TYPE(TEXT_OVERFLOW) DECLARE_DISPLAY_ITEM_TYPE_FLAGS(TRANSFORM,TYPE_RENDERS_NO_IMAGES) |