summaryrefslogtreecommitdiffstats
path: root/layout/generic
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-03 19:43:51 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-03 19:43:51 +0100
commit5ab2da700448caf181dae7dec2f53997faf118ea (patch)
treed04be907b452da59046b8c8cefbdd8a6c2f7cfd1 /layout/generic
parentce11d5cae866f24b8f7435cdc3725cfd2748595b (diff)
downloadUXP-5ab2da700448caf181dae7dec2f53997faf118ea.tar
UXP-5ab2da700448caf181dae7dec2f53997faf118ea.tar.gz
UXP-5ab2da700448caf181dae7dec2f53997faf118ea.tar.lz
UXP-5ab2da700448caf181dae7dec2f53997faf118ea.tar.xz
UXP-5ab2da700448caf181dae7dec2f53997faf118ea.zip
Issue #146 - Part 6: Allow `position: sticky` on table elements.
Diffstat (limited to 'layout/generic')
-rw-r--r--layout/generic/StickyScrollContainer.cpp2
-rw-r--r--layout/generic/nsFrame.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/layout/generic/StickyScrollContainer.cpp b/layout/generic/StickyScrollContainer.cpp
index ff8ebcfef..c5ed44e92 100644
--- a/layout/generic/StickyScrollContainer.cpp
+++ b/layout/generic/StickyScrollContainer.cpp
@@ -45,7 +45,7 @@ StickyScrollContainer::GetStickyScrollContainerForFrame(nsIFrame* aFrame)
// <html style="position: fixed">
return nullptr;
}
- auto frame = static_cast<nsIFrame*>(do_QueryFrame(scrollFrame));
+ nsIFrame* frame = do_QueryFrame(scrollFrame);
StickyScrollContainer* s =
frame->GetProperty(StickyScrollContainerProperty());
if (!s) {
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index d4bcf22ed..bbbb5c332 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -562,15 +562,12 @@ nsFrame::Init(nsIContent* aContent,
}
if (disp->mPosition == NS_STYLE_POSITION_STICKY &&
!aPrevInFlow &&
- !(mState & NS_FRAME_IS_NONDISPLAY) &&
- !disp->IsInnerTableStyle()) {
+ !(mState & NS_FRAME_IS_NONDISPLAY)) {
// Note that we only add first continuations, but we really only
// want to add first continuation-or-ib-split-siblings. But since we
// don't yet know if we're a later part of a block-in-inline split,
// we'll just add later members of a block-in-inline split here, and
// then StickyScrollContainer will remove them later.
- // We don't currently support relative positioning of inner table
- // elements (bug 35168), so exclude them from sticky positioning too.
StickyScrollContainer* ssc =
StickyScrollContainer::GetStickyScrollContainerForFrame(this);
if (ssc) {