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

Backint out bug 580450, changeset 4d2c9a0c5e1c

Browse Source
This commit is contained in:
Josh Matthews 2010-08-02 11:29:10 -04:00
parent ea56218085
commit 1a55ff58cd
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/ContentChild.cpp
View File

@ -351,7 +351,7 @@ ContentChild::RecvNotifyRemotePrefObserver(const nsCString& aPref)
bool
ContentChild::RecvNotifyVisited(const IPC::URI& aURI)
{
nsCOMPtr<nsIURI> newURI(aURI);
nsCOMPtr<nsIURI> newURI = aURI;
History::GetService()->NotifyVisited(newURI);
return true;
}

12
dom/ipc/ContentParent.cpp
View File

@ -277,7 +277,7 @@ ContentParent::RecvTestPermission(const IPC::URI& aUri,
{
EnsurePermissionService();
nsCOMPtr<nsIURI> uri(aUri);
nsCOMPtr<nsIURI> uri = aUri;
if (aExact) {
mPermissionService->TestExactPermission(uri, aType.get(), retValue);
} else {
@ -435,7 +435,7 @@ ContentParent::RequestRunToCompletion()
bool
ContentParent::RecvStartVisitedQuery(const IPC::URI& aURI)
{
nsCOMPtr<nsIURI> newURI(aURI);
nsCOMPtr<nsIURI> newURI = aURI;
IHistory *history = nsContentUtils::GetHistory();
history->RegisterVisitedCallback(newURI, nsnull);
return true;
@ -444,11 +444,11 @@ ContentParent::RecvStartVisitedQuery(const IPC::URI& aURI)
bool
ContentParent::RecvVisitURI(const IPC::URI& uri,
const IPC::URI& referrer,
const PRUint32& flags)
const IPC::URI& referrer,
const PRUint32& flags)
{
nsCOMPtr<nsIURI> ourURI(uri);
nsCOMPtr<nsIURI> ourReferrer(referrer);
nsCOMPtr<nsIURI> ourURI = uri;
nsCOMPtr<nsIURI> ourReferrer = referrer;
IHistory *history = nsContentUtils::GetHistory();
history->VisitURI(ourURI, ourReferrer, flags);
return true;

8
netwerk/cookie/CookieServiceParent.cpp
View File

@ -70,8 +70,8 @@ CookieServiceParent::RecvGetCookieString(const IPC::URI& aHost,
// Deserialize URIs. Having a host URI is mandatory and should always be
// provided by the child; thus we consider failure fatal.
nsCOMPtr<nsIURI> hostURI(aHost);
nsCOMPtr<nsIURI> originatingURI(aOriginating);
nsCOMPtr<nsIURI> hostURI = aHost;
nsCOMPtr<nsIURI> originatingURI = aOriginating;
if (!hostURI)
return false;
@ -92,8 +92,8 @@ CookieServiceParent::RecvSetCookieString(const IPC::URI& aHost,
// Deserialize URIs. Having a host URI is mandatory and should always be
// provided by the child; thus we consider failure fatal.
nsCOMPtr<nsIURI> hostURI(aHost);
nsCOMPtr<nsIURI> originatingURI(aOriginating);
nsCOMPtr<nsIURI> hostURI = aHost;
nsCOMPtr<nsIURI> originatingURI = aOriginating;
if (!hostURI)
return false;

13
netwerk/ipc/NeckoMessageUtils.h
View File

@ -57,16 +57,15 @@ class URI {
public:
URI() : mURI(nsnull) {}
URI(nsIURI* aURI) : mURI(aURI) {}
operator nsIURI*() const { return mURI.get(); }
// The contained URI is already addrefed on creation. We don't want another
// addref when passing it off to its actual owner.
operator nsCOMPtr<nsIURI>() const { return already_AddRefed<nsIURI>(mURI); }
friend struct ParamTraits<URI>;
private:
// Unimplemented
URI(URI&);
URI& operator=(URI&);
nsCOMPtr<nsIURI> mURI;
nsIURI* mURI;
};
template<>
@ -137,7 +136,7 @@ struct ParamTraits<URI>
if (NS_FAILED(rv))
return false;
uri.swap(aResult->mURI);
uri.forget(&aResult->mURI);
return true;
}
@ -154,7 +153,7 @@ struct ParamTraits<URI>
if (!serializable || !serializable->Read(aMsg, aIter))
return false;
uri.swap(aResult->mURI);
uri.forget(&aResult->mURI);
return true;
}

10
netwerk/protocol/http/HttpChannelParent.cpp
View File

@ -107,11 +107,11 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI,
const PRBool& allowPipelining,
const PRBool& forceAllowThirdPartyCookie)
{
nsCOMPtr<nsIURI> uri(aURI);
nsCOMPtr<nsIURI> originalUri(aOriginalURI);
nsCOMPtr<nsIURI> docUri(aDocURI);
nsCOMPtr<nsIURI> referrerUri(aReferrerURI);
nsCOMPtr<nsIURI> uri = aURI;
nsCOMPtr<nsIURI> originalUri = aOriginalURI;
nsCOMPtr<nsIURI> docUri = aDocURI;
nsCOMPtr<nsIURI> referrerUri = aReferrerURI;
nsCString uriSpec;
uri->GetSpec(uriSpec);
LOG(("HttpChannelParent RecvAsyncOpen [this=%x uri=%s]\n",