From 58a3d9a48631f92d8bc2bd9af5c7d17184006ad9 Mon Sep 17 00:00:00 2001 From: kyo_ago Date: Fri, 21 Nov 2014 19:47:46 +0900 Subject: [PATCH 1/3] Added removeListeners to chrome --- chrome/chrome.d.ts | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index c7eb82b1b..dd7763dc4 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2395,40 +2395,49 @@ declare module chrome.webRequest { requestBody: RequestBody; } - interface WebRequestCompletedEvent extends chrome.events.Event { + interface WebRequestCompletedEvent extends chrome.events.Event { addListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestHeadersReceivedEvent extends chrome.events.Event { + interface WebRequestHeadersReceivedEvent extends chrome.events.Event { addListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestBeforeRedirectEvent extends chrome.events.Event { + interface WebRequestBeforeRedirectEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestAuthRequiredEvent extends chrome.events.Event { + interface WebRequestAuthRequiredEvent extends chrome.events.Event { addListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; + removeListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; } - interface WebRequestBeforeSendHeadersEvent extends chrome.events.Event { + interface WebRequestBeforeSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestErrorOccurredEvent extends chrome.events.Event { + interface WebRequestErrorOccurredEvent extends chrome.events.Event { addListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestResponseStartedEvent extends chrome.events.Event { + interface WebRequestResponseStartedEvent extends chrome.events.Event { addListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestSendHeadersEvent extends chrome.events.Event { + interface WebRequestSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestBeforeRequestEvent extends chrome.events.Event { + interface WebRequestBeforeRequestEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number; From c6a96bb1f9a6332f4c25392c0d08ee6e716d465d Mon Sep 17 00:00:00 2001 From: kyo_ago Date: Fri, 21 Nov 2014 19:49:21 +0900 Subject: [PATCH 2/3] Update chrome.d.ts --- chrome/chrome.d.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index dd7763dc4..f335b71d5 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2395,47 +2395,47 @@ declare module chrome.webRequest { requestBody: RequestBody; } - interface WebRequestCompletedEvent extends chrome.events.Event { + interface WebRequestCompletedEvent extends chrome.events.Event { addListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestHeadersReceivedEvent extends chrome.events.Event { + interface WebRequestHeadersReceivedEvent extends chrome.events.Event { addListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestBeforeRedirectEvent extends chrome.events.Event { + interface WebRequestBeforeRedirectEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestAuthRequiredEvent extends chrome.events.Event { + interface WebRequestAuthRequiredEvent extends chrome.events.Event { addListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; removeListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; } - interface WebRequestBeforeSendHeadersEvent extends chrome.events.Event { + interface WebRequestBeforeSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestErrorOccurredEvent extends chrome.events.Event { + interface WebRequestErrorOccurredEvent extends chrome.events.Event { addListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestResponseStartedEvent extends chrome.events.Event { + interface WebRequestResponseStartedEvent extends chrome.events.Event { addListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestSendHeadersEvent extends chrome.events.Event { + interface WebRequestSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } - interface WebRequestBeforeRequestEvent extends chrome.events.Event { + interface WebRequestBeforeRequestEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; removeListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; } From 179d74f22a1c3c53ddd55ee64a1a689ab2fa5654 Mon Sep 17 00:00:00 2001 From: kyo-ago Date: Sat, 22 Nov 2014 22:01:01 +0900 Subject: [PATCH 3/3] Fixed removeListener params(from http://src.chromium.org/viewvc/chrome/trunk/src/chrome/test/data/extensions/api_test/webrequest/test_api.js ) --- chrome/chrome.d.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index f335b71d5..d590eb3a9 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2397,47 +2397,47 @@ declare module chrome.webRequest { interface WebRequestCompletedEvent extends chrome.events.Event { addListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnCompletedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnCompletedDetails) => BlockingResponse): void; } interface WebRequestHeadersReceivedEvent extends chrome.events.Event { addListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnHeadersReceivedDetails) => BlockingResponse): void; } interface WebRequestBeforeRedirectEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeRedirectDetails) => BlockingResponse): void; } interface WebRequestAuthRequiredEvent extends chrome.events.Event { addListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; - removeListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]) => void): void; + removeListener(callback: (details: OnAuthRequiredDetails, callback?: (response: BlockingResponse) => void) => void): void; } interface WebRequestBeforeSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeSendHeadersDetails) => BlockingResponse): void; } interface WebRequestErrorOccurredEvent extends chrome.events.Event { addListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnErrorOccurredDetails) => BlockingResponse): void; } interface WebRequestResponseStartedEvent extends chrome.events.Event { addListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnResponseStartedDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnResponseStartedDetails) => BlockingResponse): void; } interface WebRequestSendHeadersEvent extends chrome.events.Event { addListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnSendHeadersDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnSendHeadersDetails) => BlockingResponse): void; } interface WebRequestBeforeRequestEvent extends chrome.events.Event { addListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; - removeListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void; + removeListener(callback: (details: OnBeforeRequestDetails) => BlockingResponse): void; } var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;