зеркало из https://github.com/mozilla/pjs.git
bug=36212, bustage
r,a=HurricaneSherrif This checkin fixes a problem using the ?: operator and nsCOMPtr.
This commit is contained in:
Родитель
9c9586f5d7
Коммит
28e024fdd5
|
@ -1709,10 +1709,18 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetURL(const char *aURL, const char *aTarge
|
||||||
postDataStream = do_QueryInterface(result, &rv);
|
postDataStream = do_QueryInterface(result, &rv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
if (postDataStream) {
|
||||||
fullurl.GetUnicode(),
|
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
||||||
unitarget.GetUnicode(),
|
fullurl.GetUnicode(),
|
||||||
postDataStream);
|
unitarget.GetUnicode(),
|
||||||
|
postDataStream);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
||||||
|
fullurl.GetUnicode(),
|
||||||
|
unitarget.GetUnicode(),
|
||||||
|
nsnull);
|
||||||
|
}
|
||||||
NS_IF_RELEASE(content);
|
NS_IF_RELEASE(content);
|
||||||
}
|
}
|
||||||
NS_RELEASE(lh);
|
NS_RELEASE(lh);
|
||||||
|
|
|
@ -1709,10 +1709,18 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetURL(const char *aURL, const char *aTarge
|
||||||
postDataStream = do_QueryInterface(result, &rv);
|
postDataStream = do_QueryInterface(result, &rv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
if (postDataStream) {
|
||||||
fullurl.GetUnicode(),
|
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
||||||
unitarget.GetUnicode(),
|
fullurl.GetUnicode(),
|
||||||
postDataStream);
|
unitarget.GetUnicode(),
|
||||||
|
postDataStream);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
rv = lh->OnLinkClick(content, eLinkVerb_Replace,
|
||||||
|
fullurl.GetUnicode(),
|
||||||
|
unitarget.GetUnicode(),
|
||||||
|
nsnull);
|
||||||
|
}
|
||||||
NS_IF_RELEASE(content);
|
NS_IF_RELEASE(content);
|
||||||
}
|
}
|
||||||
NS_RELEASE(lh);
|
NS_RELEASE(lh);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче