Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 990974 - When using display ports, don't clip the painted contents to the content box clip. r=roc

Browse Source 
Store the content box clip on mAncestorClip, and store a different clip for the caret on mAncestorClipForCaret.
In a future patch, those clips will be selectively applied to the right layers.

--HG--
extra : rebase_source : e87e63a7ba5e963b7e3b22b5d93dc8c473a6a905
extra : histedit_source : b0e2193cf73222e51ed641e84ccaea8001e47324
This commit is contained in:
Markus Stange 2015-07-03 14:06:15 -04:00
parent a3ed6807fa
commit 5fef3abfd9
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
layout/generic/nsGfxScrollFrame.cpp
View File

@ -1794,6 +1794,7 @@ ScrollFrameHelper::ScrollFrameHelper(nsContainerFrame* aOuter,
, mScrollPosForLayerPixelAlignment(-1, -1)
, mLastUpdateImagesPos(-1, -1)
, mAncestorClip(nullptr)
, mAncestorClipForCaret(nullptr)
, mNeverHasVerticalScrollbar(false)
, mNeverHasHorizontalScrollbar(false)
, mHasVerticalScrollbar(false)
@ -2680,7 +2681,8 @@ static void
ClipItemsExceptCaret(nsDisplayList* aList,
nsDisplayListBuilder* aBuilder,
nsIFrame* aClipFrame,
const DisplayItemClip& aNonCaretClip)
const DisplayItemClip& aNonCaretClip,
bool aUsingDisplayPort)
{
for (nsDisplayItem* i = aList->GetBottom(); i; i = i->GetAbove()) {
if (!ShouldBeClippedByFrame(aClipFrame, i->Frame())) {
@ -2688,7 +2690,7 @@ ClipItemsExceptCaret(nsDisplayList* aList,
}
bool isCaret = i->GetType() == nsDisplayItem::TYPE_CARET;
if (!isCaret) {
if (!aUsingDisplayPort && !isCaret) {
bool unused;
nsRect bounds = i->GetBounds(aBuilder, &unused);
if (aNonCaretClip.IsRectAffectedByClip(bounds)) {
@ -2700,7 +2702,8 @@ ClipItemsExceptCaret(nsDisplayList* aList,
}
nsDisplayList* children = i->GetSameCoordinateSystemChildren();
if (children) {
ClipItemsExceptCaret(children, aBuilder, aClipFrame, aNonCaretClip);
ClipItemsExceptCaret(children, aBuilder, aClipFrame, aNonCaretClip,
aUsingDisplayPort);
}
}
}
@ -2709,16 +2712,17 @@ static void
ClipListsExceptCaret(nsDisplayListCollection* aLists,
nsDisplayListBuilder* aBuilder,
nsIFrame* aClipFrame,
const nsRect& aNonCaretClip)
const nsRect& aNonCaretClip,
bool aUsingDisplayPort)
{
DisplayItemClip clip;
clip.SetTo(aNonCaretClip);
ClipItemsExceptCaret(aLists->BorderBackground(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->BlockBorderBackgrounds(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->Floats(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->PositionedDescendants(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->Outlines(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->Content(), aBuilder, aClipFrame, clip);
ClipItemsExceptCaret(aLists->BorderBackground(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
ClipItemsExceptCaret(aLists->BlockBorderBackgrounds(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
ClipItemsExceptCaret(aLists->Floats(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
ClipItemsExceptCaret(aLists->PositionedDescendants(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
ClipItemsExceptCaret(aLists->Outlines(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
ClipItemsExceptCaret(aLists->Content(), aBuilder, aClipFrame, clip, aUsingDisplayPort);
}
void
@ -2748,6 +2752,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// Clear the scroll port clip that was set during the last paint.
mAncestorClip = nullptr;
mAncestorClipForCaret = nullptr;
// We put non-overlay scrollbars in their own layers when this is the root
// scroll frame and we are a toplevel content document. In this situation,
@ -2983,10 +2988,24 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
}
Maybe<DisplayListClipState::AutoSaveRestore> clipStateNonCaret;
if (usingDisplayport) {
// Capture the clip state of the parent scroll frame. This will be saved
// on FrameMetrics for layers with this frame as their animated geoemetry
// root.
mAncestorClipForCaret = aBuilder->ClipState().GetCurrentCombinedClip(aBuilder);
// Add the non-caret content box clip here so that it gets picked up by
// mAncestorClip.
if (contentBoxClipForNonCaretContent) {
clipStateNonCaret.emplace(aBuilder);
clipStatePtr = &*clipStateNonCaret;
if (mClipAllDescendants) {
clipStateNonCaret->ClipContentDescendants(*contentBoxClipForNonCaretContent);
} else {
clipStateNonCaret->ClipContainingBlockDescendants(*contentBoxClipForNonCaretContent);
}
}
mAncestorClip = aBuilder->ClipState().GetCurrentCombinedClip(aBuilder);
// If we are using a display port, then ignore any pre-existing clip
@ -3026,7 +3045,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
if (contentBoxClipForNonCaretContent) {
ClipListsExceptCaret(&scrolledContent, aBuilder, mScrolledFrame,
*contentBoxClipForNonCaretContent);
*contentBoxClipForNonCaretContent, usingDisplayport);
}
if (shouldBuildLayer) {

1
layout/generic/nsGfxScrollFrame.h
View File

@ -460,6 +460,7 @@ public:
// The scroll port clip. Only valid during painting.
const DisplayItemClip* mAncestorClip;
const DisplayItemClip* mAncestorClipForCaret;
bool mNeverHasVerticalScrollbar:1;
bool mNeverHasHorizontalScrollbar:1;