зеркало из https://github.com/mozilla/gecko-dev.git
Backout d30b99cfd933 (bug 802385), 58ce0ddf7611 (bug 810275), 1c96b4a67d38 (bug 810592) for reftest failures
This commit is contained in:
Родитель
66c40169dc
Коммит
68f1c3e84e
|
@ -1407,7 +1407,7 @@ ContainerState::CreateOrRecycleThebesLayer(const nsIFrame* aActiveScrolledRoot,
|
|||
#ifndef MOZ_ANDROID_OMTC
|
||||
// Calculate exact position of the top-left of the active scrolled root.
|
||||
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.
|
||||
gfxPoint activeScrolledRootTopLeft = scaledOffset - matrix.GetTranslation() + mParameters.mOffset;
|
||||
gfxPoint activeScrolledRootTopLeft = scaledOffset - matrix.GetTranslation();
|
||||
// If it has changed, then we need to invalidate the entire layer since the
|
||||
// pixels in the layer buffer have the content at a (subpixel) offset
|
||||
// from what we need.
|
||||
|
@ -2856,11 +2856,9 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
|
|||
nsRect bounds;
|
||||
nsIntRect pixBounds;
|
||||
int32_t appUnitsPerDevPixel;
|
||||
uint32_t stateFlags = 0;
|
||||
if ((aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) &&
|
||||
mRetainingManager && !mRetainingManager->AreComponentAlphaLayersEnabled()) {
|
||||
stateFlags = ContainerState::NO_COMPONENT_ALPHA;
|
||||
}
|
||||
uint32_t stateFlags =
|
||||
(aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) ?
|
||||
ContainerState::NO_COMPONENT_ALPHA : 0;
|
||||
uint32_t flags;
|
||||
while (true) {
|
||||
ContainerState state(aBuilder, aManager, aManager->GetLayerBuilder(),
|
||||
|
|
|
@ -414,10 +414,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|||
childItems.AppendToTop(zoomItem);
|
||||
}
|
||||
|
||||
nsIScrollableFrame *sf = presShell->GetRootScrollFrameAsScrollable();
|
||||
if (!addedLayer &&
|
||||
(presContext->IsRootContentDocument() ||
|
||||
(sf && sf->IsScrollingActive()))) {
|
||||
if (!addedLayer && presContext->IsRootContentDocument()) {
|
||||
// We always want top level content documents to be in their own layer.
|
||||
nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer(
|
||||
aBuilder, subdocRootFrame ? subdocRootFrame : this,
|
||||
|
|
Загрузка…
Ссылка в новой задаче