Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 877097: Hold strong refs to instances of ScrollbarActivity to avoid crashing. r=mats

Browse Source
This commit is contained in:
Stephen Pohl 2013-07-31 21:43:56 -04:00
parent 1340edfe51
commit 29b7462867
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/ScrollbarActivity.h
View File

@ -88,7 +88,9 @@ public:
virtual void WillRefresh(TimeStamp aTime) MOZ_OVERRIDE;
static void FadeBeginTimerFired(nsITimer* aTimer, void* aSelf) {
reinterpret_cast<ScrollbarActivity*>(aSelf)->BeginFade();
nsRefPtr<ScrollbarActivity> scrollbarActivity(
reinterpret_cast<ScrollbarActivity*>(aSelf));
scrollbarActivity->BeginFade();
}
protected:

6
layout/generic/nsGfxScrollFrame.cpp
View File

@ -3014,7 +3014,8 @@ void nsGfxScrollFrameInner::CurPosAttributeChanged(nsIContent* aContent)
}
if (mScrollbarActivity) {
mScrollbarActivity->ActivityOccurred();
nsRefPtr<ScrollbarActivity> scrollbarActivity(mScrollbarActivity);
scrollbarActivity->ActivityOccurred();
}
bool isSmooth = aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::smooth);
@ -3889,7 +3890,8 @@ nsGfxScrollFrameInner::SetCoordAttribute(nsIContent* aContent, nsIAtom* aAtom,
aContent->SetAttr(kNameSpaceID_None, aAtom, newValue, true);
if (mScrollbarActivity) {
mScrollbarActivity->ActivityOccurred();
nsRefPtr<ScrollbarActivity> scrollbarActivity(mScrollbarActivity);
scrollbarActivity->ActivityOccurred();
}
}

2
layout/generic/nsGfxScrollFrame.h
View File

@ -287,7 +287,7 @@ public:
nsIFrame* mResizerBox;
nsContainerFrame* mOuter;
nsRefPtr<AsyncScroll> mAsyncScroll;
nsCOMPtr<ScrollbarActivity> mScrollbarActivity;
nsRefPtr<ScrollbarActivity> mScrollbarActivity;
nsTArray<nsIScrollPositionListener*> mListeners;
nsRect mScrollPort;
// Where we're currently scrolling to, if we're scrolling asynchronously.

2
layout/xul/tree/nsTreeBodyFrame.h
View File

@ -543,7 +543,7 @@ protected: // Data Members
nsRevocableEventPtr<ScrollEvent> mScrollEvent;
nsCOMPtr<ScrollbarActivity> mScrollbarActivity;
nsRefPtr<ScrollbarActivity> mScrollbarActivity;
// The cached box object parent.
nsCOMPtr<nsITreeBoxObject> mTreeBoxObject;