зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1282150 part 5. Kill off all the unused GetJSContextForEventHandlers cruft. r=bholley
This commit is contained in:
Родитель
97b0a16147
Коммит
3b1ead601a
|
@ -3300,12 +3300,6 @@ nsGlobalWindow::WillHandleEvent(EventChainPostVisitor& aVisitor)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
JSContext*
|
||||
nsGlobalWindow::GetJSContextForEventHandlers()
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsGlobalWindow::PreHandleEvent(EventChainPreVisitor& aVisitor)
|
||||
{
|
||||
|
|
|
@ -117,7 +117,6 @@ public:
|
|||
}
|
||||
using mozilla::DOMEventTargetHelper::AddEventListener;
|
||||
|
||||
virtual JSContext* GetJSContextForEventHandlers() override { return nsContentUtils::GetSafeJSContext(); }
|
||||
virtual nsIPrincipal* GetPrincipal() override { return mPrincipal; }
|
||||
void LoadFrameScript(const nsAString& aURL, bool aRunInGlobalScope);
|
||||
void FireUnloadEvent();
|
||||
|
|
|
@ -292,9 +292,6 @@ NS_DEFINE_STATIC_IID_ACCESSOR(DOMEventTargetHelper,
|
|||
} \
|
||||
virtual nsIScriptContext * GetContextForEventHandlers(nsresult *aRv) { \
|
||||
return _to GetContextForEventHandlers(aRv); \
|
||||
} \
|
||||
virtual JSContext * GetJSContextForEventHandlers(void) { \
|
||||
return _to GetJSContextForEventHandlers(); \
|
||||
}
|
||||
|
||||
#define NS_REALLY_FORWARD_NSIDOMEVENTTARGET(_class) \
|
||||
|
|
|
@ -274,12 +274,6 @@ interface nsIDOMEventTarget : nsISupports
|
|||
*/
|
||||
[notxpcom, nostdcall]
|
||||
nsIScriptContext GetContextForEventHandlers(out nsresult aRv);
|
||||
|
||||
/**
|
||||
* If the method above returns null, but a success code, this method
|
||||
* is called.
|
||||
*/
|
||||
[notxpcom, nostdcall] JSContextPtr GetJSContextForEventHandlers();
|
||||
};
|
||||
|
||||
%{C++
|
||||
|
@ -287,8 +281,7 @@ interface nsIDOMEventTarget : nsISupports
|
|||
#define NS_IMPL_DOMTARGET_DEFAULTS(_class) \
|
||||
mozilla::dom::EventTarget* _class::GetTargetForDOMEvent() { return this; } \
|
||||
mozilla::dom::EventTarget* _class::GetTargetForEventTargetChain() { return this; } \
|
||||
nsresult _class::WillHandleEvent(mozilla::EventChainPostVisitor& aVisitor) { return NS_OK; } \
|
||||
JSContext* _class::GetJSContextForEventHandlers() { return nullptr; }
|
||||
nsresult _class::WillHandleEvent(mozilla::EventChainPostVisitor& aVisitor) { return NS_OK; }
|
||||
|
||||
#define NS_IMPL_REMOVE_SYSTEM_EVENT_LISTENER(aClass) \
|
||||
NS_IMETHODIMP \
|
||||
|
|
|
@ -3339,12 +3339,6 @@ TabChildGlobal::GetDocShell(nsIDocShell** aDocShell)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
JSContext*
|
||||
TabChildGlobal::GetJSContextForEventHandlers()
|
||||
{
|
||||
return nsContentUtils::GetSafeJSContext();
|
||||
}
|
||||
|
||||
nsIPrincipal*
|
||||
TabChildGlobal::GetPrincipal()
|
||||
{
|
||||
|
|
|
@ -138,7 +138,6 @@ public:
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual JSContext* GetJSContextForEventHandlers() override;
|
||||
virtual nsIPrincipal* GetPrincipal() override;
|
||||
virtual JSObject* GetGlobalJSObject() override;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче