Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 627474 - Part 2: Use nsIXPConnect::WrapNative directly in order to avoid having to link in libgklayout in non-libxul builds; r=bzbarsky a=bustage

Browse Source 
--HG--
extra : rebase_source : 58c2f6e6bc3a8fd1070732a9b27d780739afc7f7
This commit is contained in:
Ehsan Akhgari 2011-01-20 15:23:48 -05:00
parent aa6e9c5442
commit 57bd111b18
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toolkit/components/places/src/PlaceInfo.cpp
View File

@ -38,7 +38,8 @@
#include "PlaceInfo.h"
#include "VisitInfo.h"
#include "nsIURI.h"
#include "nsContentUtils.h"
#include "nsServiceManagerUtils.h"
#include "nsIXPConnect.h"
namespace mozilla {
namespace places {
@ -112,13 +113,23 @@ PlaceInfo::GetVisits(JSContext* aContext,
JSObject* global = JS_GetGlobalForScopeChain(aContext);
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID);
nsresult rv;
nsCOMPtr<nsIXPConnect> xpc(do_GetService(kXPConnectCID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
for (VisitsArray::size_type idx = 0; idx < mVisits.Length(); idx++) {
jsval wrappedVisit;
nsresult rv = nsContentUtils::WrapNative(aContext, global, mVisits[idx],
&NS_GET_IID(mozIVisitInfo),
&wrappedVisit);
nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
rv = xpc->WrapNative(aContext, global, mVisits[idx],
NS_GET_IID(mozIVisitInfo),
getter_AddRefs(wrapper));
NS_ENSURE_SUCCESS(rv, rv);
JSObject* jsobj;
rv = wrapper->GetJSObject(&jsobj);
NS_ENSURE_SUCCESS(rv, rv);
jsval wrappedVisit = OBJECT_TO_JSVAL(jsobj);
JSBool rc = JS_SetElement(aContext, visits, idx, &wrappedVisit);
NS_ENSURE_TRUE(rc, NS_ERROR_UNEXPECTED);
}