mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backout d30b99cfd933 (bug 802385), 58ce0ddf7611 (bug 810275), 1c96b4a67d38 (bug 810592) for reftest failures

This commit is contained in:
Ed Morley 2012-11-22 09:59:23 +00:00
Родитель 66c40169dc
Коммит 68f1c3e84e
2 изменённых файлов: 5 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
layout/base/FrameLayerBuilder.cpp
Просмотреть файл

@ -1407,7 +1407,7 @@ ContainerState::CreateOrRecycleThebesLayer(const nsIFrame* aActiveScrolledRoot,
#ifndef MOZ_ANDROID_OMTC #ifndef MOZ_ANDROID_OMTC
// Calculate exact position of the top-left of the active scrolled root. // Calculate exact position of the top-left of the active scrolled root.
// This might not be 0,0 due to the snapping in ScaleToNearestPixels. // 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 // 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 // pixels in the layer buffer have the content at a (subpixel) offset
// from what we need. // from what we need.
@ -2856,11 +2856,9 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
nsRect bounds; nsRect bounds;
nsIntRect pixBounds; nsIntRect pixBounds;
int32_t appUnitsPerDevPixel; int32_t appUnitsPerDevPixel;
uint32_t stateFlags = 0; uint32_t stateFlags =
if ((aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) && (aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) ?
mRetainingManager && !mRetainingManager->AreComponentAlphaLayersEnabled()) { ContainerState::NO_COMPONENT_ALPHA : 0;
stateFlags = ContainerState::NO_COMPONENT_ALPHA;
}
uint32_t flags; uint32_t flags;
while (true) { while (true) {
ContainerState state(aBuilder, aManager, aManager->GetLayerBuilder(), ContainerState state(aBuilder, aManager, aManager->GetLayerBuilder(),

5
layout/generic/nsSubDocumentFrame.cpp
Просмотреть файл

@ -414,10 +414,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
childItems.AppendToTop(zoomItem); childItems.AppendToTop(zoomItem);
} }
nsIScrollableFrame *sf = presShell->GetRootScrollFrameAsScrollable(); if (!addedLayer && presContext->IsRootContentDocument()) {
if (!addedLayer &&
(presContext->IsRootContentDocument() ||
(sf && sf->IsScrollingActive()))) {
// We always want top level content documents to be in their own layer. // We always want top level content documents to be in their own layer.
nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer( nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer(
aBuilder, subdocRootFrame ? subdocRootFrame : this, aBuilder, subdocRootFrame ? subdocRootFrame : this,