corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1491735 - Remove the XPCOM registration for nsWebBrowserFind; r=bzbarsky

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D5993
This commit is contained in:
Ehsan Akhgari
2018-09-17 00:33:59 -04:00
parent 45f05d8960
commit 5b2864e8bb
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@@ -193,6 +193,7 @@
#include "nsView.h"
#include "nsViewManager.h"
#include "nsViewSourceHandler.h"
#include "nsWebBrowserFind.h"
#include "nsWhitespaceTokenizer.h"
#include "nsWidgetsCID.h"
#include "nsXULAppAPI.h"
@@ -12700,12 +12701,8 @@ nsDocShell::EnsureEditorData()
nsresult
nsDocShell::EnsureFind()
{
nsresult rv;
if (!mFind) {
mFind = do_CreateInstance("@mozilla.org/embedcomp/find;1", &rv);
if (NS_FAILED(rv)) {
return rv;
}
mFind = new nsWebBrowserFind();
}
// we promise that the nsIWebBrowserFind that we return has been set
@@ -12727,7 +12724,7 @@ nsDocShell::EnsureFind()
return NS_ERROR_NO_INTERFACE;
}
rv = findInFrames->SetRootSearchFrame(ourWindow);
nsresult rv = findInFrames->SetRootSearchFrame(ourWindow);
if (NS_FAILED(rv)) {
return rv;
}