Bug 1245185: Remove dead event handling code from nsPIDOMWindow<T>. r=smaug

This commit is contained in:
Kyle Huey 2016-02-03 13:30:45 -08:00
Родитель 0483075e02
Коммит 84bb8c423e
2 изменённых файлов: 2 добавлений и 16 удалений

Просмотреть файл

@ -1427,7 +1427,7 @@ public:
// |interval| is in milliseconds. // |interval| is in milliseconds.
nsresult SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler, nsresult SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
int32_t interval, int32_t interval,
bool aIsInterval, int32_t* aReturn) override; bool aIsInterval, int32_t* aReturn);
int32_t SetTimeoutOrInterval(JSContext* aCx, int32_t SetTimeoutOrInterval(JSContext* aCx,
mozilla::dom::Function& aFunction, mozilla::dom::Function& aFunction,
int32_t aTimeout, int32_t aTimeout,
@ -1438,12 +1438,6 @@ public:
mozilla::ErrorResult& aError); mozilla::ErrorResult& aError);
void ClearTimeoutOrInterval(int32_t aTimerID, void ClearTimeoutOrInterval(int32_t aTimerID,
mozilla::ErrorResult& aError); mozilla::ErrorResult& aError);
nsresult ClearTimeoutOrInterval(int32_t aTimerID) override
{
mozilla::ErrorResult rv;
ClearTimeoutOrInterval(aTimerID, rv);
return rv.StealNSResult();
}
// JS specific timeout functions (JS args grabbed from context). // JS specific timeout functions (JS args grabbed from context).
nsresult ResetTimersForNonBackgroundWindow(); nsresult ResetTimersForNonBackgroundWindow();

Просмотреть файл

@ -216,14 +216,6 @@ public:
virtual bool IsFrozen() const = 0; virtual bool IsFrozen() const = 0;
// Add a timeout to this window.
virtual nsresult SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
int32_t interval,
bool aIsInterval, int32_t *aReturn) = 0;
// Clear a timeout from this window.
virtual nsresult ClearTimeoutOrInterval(int32_t aTimerID) = 0;
nsPIDOMWindowOuter* GetOuterWindow() nsPIDOMWindowOuter* GetOuterWindow()
{ {
return mIsInnerWindow ? mOuterWindow.get() : AsOuter(); return mIsInnerWindow ? mOuterWindow.get() : AsOuter();