wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 855411 - Root LookupMember. r=bz,terrence

Browse Source
This commit is contained in:
Tom Schuster 2013-04-05 15:21:01 +02:00
parent 4a0f5a6352
commit 556e3087f2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/xbl/src/nsXBLBinding.cpp
View File

@ -1431,9 +1431,9 @@ nsXBLBinding::LookupMember(JSContext* aCx, JS::HandleId aId,
// Get the scope of mBoundElement and the associated XBL scope. We should only
// be calling into this machinery if we're running in a separate XBL scope.
JSObject* boundScope =
js::GetGlobalForObjectCrossCompartment(mBoundElement->GetWrapper());
JSObject* xblScope = xpc::GetXBLScope(aCx, boundScope);
JS::Rooted<JSObject*> boundScope(aCx,
js::GetGlobalForObjectCrossCompartment(mBoundElement->GetWrapper()));
JS::Rooted<JSObject*> xblScope(aCx, xpc::GetXBLScope(aCx, boundScope));
MOZ_ASSERT(boundScope != xblScope);
// Enter the xbl scope and invoke the internal version.
@ -1455,7 +1455,7 @@ bool
nsXBLBinding::LookupMemberInternal(JSContext* aCx, nsString& aName,
JS::HandleId aNameAsId,
JSPropertyDescriptor* aDesc,
JSObject* aXBLScope)
JS::Handle<JSObject*> aXBLScope)
{
// First, see if we have a JSClass. If we don't, it means that this binding
// doesn't have a class object, and thus doesn't have any members. Skip it.

2
content/xbl/src/nsXBLBinding.h
View File

@ -89,7 +89,7 @@ protected:
* Internal version. Requires that aCx is in appropriate xbl scope.
*/
bool LookupMemberInternal(JSContext* aCx, nsString& aName, JS::HandleId aNameAsId,
JSPropertyDescriptor* aDesc, JSObject* aXBLScope);
JSPropertyDescriptor* aDesc, JS::Handle<JSObject*> aXBLScope);
public: