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

Bug 386473 - Change a few QueryInterface functions in nsSearchService.js to use XPCOMUtils.generateQI. Based on a patch originally by Ryan Flint. r=florian

Browse Source 
MozReview-Commit-ID: 2xB9VjjnKW1

--HG--
extra : rebase_source : c597dbb94f6bf80c4fdee2165ac77bebe38ef207
This commit is contained in:
Mark Banner 2016-11-02 10:39:53 +00:00
parent 9fa69d0bdb
commit 9c3d575a0f
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
toolkit/components/search/nsSearchService.js
View File

@ -312,20 +312,15 @@ loadListener.prototype = {
_engine: null,
_stream: null,
QueryInterface: function SRCH_loadQI(aIID) {
if (aIID.equals(Ci.nsISupports) ||
aIID.equals(Ci.nsIRequestObserver) ||
aIID.equals(Ci.nsIStreamListener) ||
aIID.equals(Ci.nsIChannelEventSink) ||
aIID.equals(Ci.nsIInterfaceRequestor) ||
// See FIXME comment below
aIID.equals(Ci.nsIHttpEventSink) ||
aIID.equals(Ci.nsIProgressEventSink) ||
false)
return this;
throw Cr.NS_ERROR_NO_INTERFACE;
},
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIRequestObserver,
Ci.nsIStreamListener,
Ci.nsIChannelEventSink,
Ci.nsIInterfaceRequestor,
// See FIXME comment below.
Ci.nsIHttpEventSink,
Ci.nsIProgressEventSink
]),
// nsIRequestObserver
onStartRequest: function SRCH_loadStartR(aRequest, aContext) {
@ -2507,12 +2502,7 @@ Engine.prototype = {
},
// nsISupports
QueryInterface: function SRCH_ENG_QI(aIID) {
if (aIID.equals(Ci.nsISearchEngine) ||
aIID.equals(Ci.nsISupports))
return this;
throw Cr.NS_ERROR_NO_INTERFACE;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsISearchEngine]),
get wrappedJSObject() {
return this;
@ -2614,12 +2604,7 @@ Submission.prototype = {
get postData() {
return this._postData;
},
QueryInterface: function SRCH_SUBM_QI(aIID) {
if (aIID.equals(Ci.nsISearchSubmission) ||
aIID.equals(Ci.nsISupports))
return this;
throw Cr.NS_ERROR_NO_INTERFACE;
}
QueryInterface: XPCOMUtils.generateQI([Ci.nsISearchSubmission])
}
// nsISearchParseSubmissionResult
@ -4741,14 +4726,11 @@ SearchService.prototype = {
}
},
QueryInterface: function SRCH_SVC_QI(aIID) {
if (aIID.equals(Ci.nsIBrowserSearchService) ||
aIID.equals(Ci.nsIObserver) ||
aIID.equals(Ci.nsITimerCallback) ||
aIID.equals(Ci.nsISupports))
return this;
throw Cr.NS_ERROR_NO_INTERFACE;
}
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIBrowserSearchService,
Ci.nsIObserver,
Ci.nsITimerCallback
])
};