Djam/firefox-esr78
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr78.git synced 2025-02-25 02:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix 806099 and 828206 mozilla bugs

Browse source
This commit is contained in:
Tigro 2013-02-15 14:16:00 +04:00
parent 628089c408
commit 9eab2a040d
2 changed files with 129 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firefox.spec
View file

@ -31,7 +31,7 @@
%define _use_syshunspell 0
%define release 1
%define release 2
%define update_channel release

128
mozilla-806099-fix.patch Normal file
View file

@ -0,0 +1,128 @@
diff -urN mozilla-release.orig/layout/base/FrameLayerBuilder.cpp mozilla-release/layout/base/FrameLayerBuilder.cpp
--- mozilla-release.orig/layout/base/FrameLayerBuilder.cpp 2013-02-11 17:09:53.858871503 +0400
+++ mozilla-release/layout/base/FrameLayerBuilder.cpp 2013-02-15 14:01:56.011378827 +0400
@@ -272,7 +272,8 @@
*/
void ProcessDisplayItems(const nsDisplayList& aList,
FrameLayerBuilder::Clip& aClip,
- uint32_t aFlags);
+ uint32_t aFlags,
+ const nsIFrame* aForceActiveScrolledRoot = nullptr);
/**
* This finalizes all the open ThebesLayers by popping every element off
* mThebesLayerDataStack, then sets the children of the container layer
@@ -558,6 +559,9 @@
void SetupMaskLayer(Layer *aLayer, const FrameLayerBuilder::Clip& aClip,
uint32_t aRoundedRectClipCount = UINT32_MAX);
+ bool ChooseActiveScrolledRoot(const nsDisplayList& aList,
+ const nsIFrame **aActiveScrolledRoot);
+
nsDisplayListBuilder* mBuilder;
LayerManager* mManager;
FrameLayerBuilder* mLayerBuilder;
@@ -1945,55 +1949,39 @@
}
/**
- * Checks if aAncestor is an ancestor of aFrame
- */
-static bool IsFrameAncestorOf(const nsIFrame *aAncestor, const nsIFrame *aFrame)
-{
- if (!aFrame) {
- return false;
- }
- for (const nsIFrame* f = aFrame; f; f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
- if (f == aAncestor) {
- return true;
- }
- }
- return false;
-}
-
-/**
* Chooses a single active scrolled root for the entire display list, used
* when we are flattening layers.
*/
-static bool ChooseActiveScrolledRoot(nsDisplayListBuilder *aBuilder,
- const nsDisplayList& aList,
- const nsIFrame **aActiveScrolledRoot)
+bool
+ContainerState::ChooseActiveScrolledRoot(const nsDisplayList& aList,
+ const nsIFrame **aActiveScrolledRoot)
{
for (nsDisplayItem* item = aList.GetBottom(); item; item = item->GetAbove()) {
nsDisplayItem::Type type = item->GetType();
if (type == nsDisplayItem::TYPE_CLIP ||
type == nsDisplayItem::TYPE_CLIP_ROUNDED_RECT) {
- if (!ChooseActiveScrolledRoot(aBuilder,
- *item->GetSameCoordinateSystemChildren(),
- aActiveScrolledRoot)) {
- return false;
+ if (ChooseActiveScrolledRoot(*item->GetSameCoordinateSystemChildren(),
+ aActiveScrolledRoot)) {
+ return true;
}
continue;
}
- if (!*aActiveScrolledRoot) {
- // Try using the actual active scrolled root of the backmost item, as that
- // should result in the least invalidation when scrolling.
- aBuilder->IsFixedItem(item, aActiveScrolledRoot);
- } else if (!IsFrameAncestorOf(*aActiveScrolledRoot, item->GetUnderlyingFrame())) {
- // If there are items that aren't descendants of the background's active scrolled
- // root, then give up and just use the container's reference frame instead.
- return false;
+ LayerState layerState = item->GetLayerState(mBuilder, mManager, mParameters);
+ // Don't use an item that won't be part of any ThebesLayers to pick the
+ // active scrolled root.
+ if (layerState == LAYER_ACTIVE_FORCE) {
+ continue;
+ }
+
+ // Try using the actual active scrolled root of the backmost item, as that
+ // should result in the least invalidation when scrolling.
+ mBuilder->IsFixedItem(item, aActiveScrolledRoot);
+ if (*aActiveScrolledRoot) {
+ return true;
}
}
- if (!*aActiveScrolledRoot) {
- return false;
- }
- return true;
+ return false;
}
/*
@@ -2013,7 +2001,8 @@
void
ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
FrameLayerBuilder::Clip& aClip,
- uint32_t aFlags)
+ uint32_t aFlags,
+ const nsIFrame* aForceActiveScrolledRoot)
{
SAMPLE_LABEL("ContainerState", "ProcessDisplayItems");
@@ -2024,7 +2013,9 @@
// layer, so we need to choose which active scrolled root to use for all
// items.
if (aFlags & NO_COMPONENT_ALPHA) {
- if (!ChooseActiveScrolledRoot(mBuilder, aList, &lastActiveScrolledRoot)) {
+ if (aForceActiveScrolledRoot) {
+ lastActiveScrolledRoot = aForceActiveScrolledRoot;
+ } else if (!ChooseActiveScrolledRoot(aList, &lastActiveScrolledRoot)) {
lastActiveScrolledRoot = mContainerReferenceFrame;
}
@@ -2036,7 +2027,7 @@
if (type == nsDisplayItem::TYPE_CLIP ||
type == nsDisplayItem::TYPE_CLIP_ROUNDED_RECT) {
FrameLayerBuilder::Clip childClip(aClip, item);
- ProcessDisplayItems(*item->GetSameCoordinateSystemChildren(), childClip, aFlags);
+ ProcessDisplayItems(*item->GetSameCoordinateSystemChildren(), childClip, aFlags, lastActiveScrolledRoot);
continue;
}