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 629577 - non-libxul builds broken by changes to History, unresolved symbol nsContentUtils::sXPConnect; r=mak a=sdwilsh

Browse Source 
--HG--
extra : rebase_source : 8cf1b8decd13a8d46c46c81c3a3fd8ee5e8597d9
This commit is contained in:
Ehsan Akhgari 2011-01-28 03:07:46 -05:00
parent b1d2463ed9
commit f958da4eb5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolkit/components/places/src/History.cpp
View File

@ -57,7 +57,7 @@
#include "mozilla/Services.h"
#include "nsThreadUtils.h"
#include "nsNetUtil.h"
#include "nsContentUtils.h"
#include "nsIXPConnect.h"
// Initial size for the cache holding visited status observers.
#define VISIT_OBSERVERS_INITIAL_CACHE_SIZE 128
@ -204,13 +204,15 @@ GetURIFromJSObject(JSContext* aCtx,
jsval uriVal;
JSBool rc = JS_GetProperty(aCtx, aObject, aProperty, &uriVal);
NS_ENSURE_TRUE(rc, nsnull);
if (!JSVAL_IS_PRIMITIVE(uriVal)) {
static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID);
nsCOMPtr<nsIXPConnect> xpc = do_GetService(kXPConnectCID);
NS_ENSURE_TRUE(xpc, nsnull);
nsCOMPtr<nsIXPConnectWrappedNative> wrappedObj;
nsresult rv = nsContentUtils::XPConnect()->GetWrappedNativeOfJSObject(
aCtx,
JSVAL_TO_OBJECT(uriVal),
getter_AddRefs(wrappedObj)
);
nsresult rv = xpc->GetWrappedNativeOfJSObject(aCtx, JSVAL_TO_OBJECT(uriVal),
getter_AddRefs(wrappedObj));
NS_ENSURE_SUCCESS(rv, nsnull);
nsCOMPtr<nsIURI> uri = do_QueryWrappedNative(wrappedObj);
return uri.forget();