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

Bug 1005392 - Fix typeaheadfind leak. r=enndeakin

Browse Source
This commit is contained in:
Olli Pettay 2014-05-07 13:55:00 -04:00
parent 3e7dcc4ccf
commit f71af05de7
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
View File

@ -7,6 +7,7 @@
#include "nsMemory.h"
#include "nsIServiceManager.h"
#include "mozilla/ModuleUtils.h"
#include "mozilla/Services.h"
#include "nsIWebBrowserChrome.h"
#include "nsCURILoader.h"
#include "nsCycleCollectionParticipant.h"
@ -75,6 +76,7 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
nsTypeAheadFind::nsTypeAheadFind():
mStartLinksOnlyPref(false),
mCaretBrowsingOn(false),
mDidAddObservers(false),
mLastFindLength(0),
mIsSoundInitialized(false),
mCaseSensitive(false)
@ -103,14 +105,21 @@ nsTypeAheadFind::Init(nsIDocShell* aDocShell)
SetDocShell(aDocShell);
// ----------- Listen to prefs ------------------
nsresult rv = prefInternal->AddObserver("accessibility.browsewithcaret", this, true);
NS_ENSURE_SUCCESS(rv, rv);
if (!mDidAddObservers) {
mDidAddObservers = true;
// ----------- Listen to prefs ------------------
nsresult rv = prefInternal->AddObserver("accessibility.browsewithcaret", this, true);
NS_ENSURE_SUCCESS(rv, rv);
// ----------- Get initial preferences ----------
PrefsReset();
// ----------- Get initial preferences ----------
PrefsReset();
return rv;
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os) {
os->AddObserver(this, DOM_WINDOW_DESTROYED_TOPIC, true);
}
}
return NS_OK;
}
nsresult
@ -169,6 +178,13 @@ nsTypeAheadFind::SetDocShell(nsIDocShell* aDocShell)
presShell = aDocShell->GetPresShell();
mPresShell = do_GetWeakReference(presShell);
ReleaseStrongMemberVariables();
return NS_OK;
}
void
nsTypeAheadFind::ReleaseStrongMemberVariables()
{
mStartFindRange = nullptr;
mStartPointRange = nullptr;
mSearchRange = nullptr;
@ -182,8 +198,6 @@ nsTypeAheadFind::SetDocShell(nsIDocShell* aDocShell)
mSelectionController = nullptr;
mFind = nullptr;
return NS_OK;
}
NS_IMETHODIMP
@ -223,8 +237,12 @@ NS_IMETHODIMP
nsTypeAheadFind::Observe(nsISupports *aSubject, const char *aTopic,
const char16_t *aData)
{
if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID))
if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
return PrefsReset();
} else if (!nsCRT::strcmp(aTopic, DOM_WINDOW_DESTROYED_TOPIC) &&
SameCOMIdentity(aSubject, mCurrentWindow)) {
ReleaseStrongMemberVariables();
}
return NS_OK;
}
@ -460,7 +478,7 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, bool aIsLinksOnly,
if (!document)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsPIDOMWindow> window = document->GetWindow();
nsCOMPtr<nsPIDOMWindow> window = document->GetInnerWindow();
NS_ASSERTION(window, "document has no window");
if (!window)
return NS_ERROR_UNEXPECTED;

3
toolkit/components/typeaheadfind/nsTypeAheadFind.h
View File

@ -70,6 +70,8 @@ protected:
// attached to the DOM window.
NS_HIDDEN_(already_AddRefed<nsIPresShell>) GetPresShell();
void ReleaseStrongMemberVariables();
// Current find state
nsString mTypeAheadBuffer;
nsCString mNotFoundSoundURL;
@ -78,6 +80,7 @@ protected:
// boolean variable is getting passed into a method.
bool mStartLinksOnlyPref;
bool mCaretBrowsingOn;
bool mDidAddObservers;
nsCOMPtr<nsIDOMElement> mFoundLink; // Most recent elem found, if a link
nsCOMPtr<nsIDOMElement> mFoundEditable; // Most recent elem found, if editable
nsCOMPtr<nsIDOMRange> mFoundRange; // Most recent range found