change name of WindowCreator function to fix inexplicable Windows error necessitating careful ordering of includes files
This commit is contained in:
Родитель
3254ed277b
Коммит
5482b478dd
|
@ -43,8 +43,8 @@ interface nsIWindowCreator : nsISupports {
|
|||
@param chromeFlags chrome features from nsIWebBrowserChrome
|
||||
@return the new window
|
||||
*/
|
||||
nsIWebBrowserChrome createWindow(in nsIWebBrowserChrome parent,
|
||||
in PRUint32 chromeFlags);
|
||||
nsIWebBrowserChrome createChromeWindow(in nsIWebBrowserChrome parent,
|
||||
in PRUint32 chromeFlags);
|
||||
};
|
||||
|
||||
%{C++
|
||||
|
|
|
@ -449,7 +449,7 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent,
|
|||
parentTreeOwner->GetNewWindow(chromeFlags, getter_AddRefs(newDocShellItem));
|
||||
else if (mWindowCreator) {
|
||||
nsCOMPtr<nsIWebBrowserChrome> newChrome;
|
||||
mWindowCreator->CreateWindow(0, chromeFlags, getter_AddRefs(newChrome));
|
||||
mWindowCreator->CreateChromeWindow(0, chromeFlags, getter_AddRefs(newChrome));
|
||||
if (newChrome) {
|
||||
nsCOMPtr<nsIInterfaceRequestor> thing(do_QueryInterface(newChrome));
|
||||
if (thing) {
|
||||
|
|
|
@ -34,9 +34,9 @@ WindowCreator::~WindowCreator() {
|
|||
NS_IMPL_ISUPPORTS1(WindowCreator, nsIWindowCreator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
WindowCreator::CreateWindow(nsIWebBrowserChrome *parent,
|
||||
PRUint32 chromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
|
||||
PRUint32 chromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
::CreateBrowserWindow(PRInt32(chromeFlags), parent, _retval);
|
||||
|
|
|
@ -34,9 +34,9 @@ WindowCreator::~WindowCreator() {
|
|||
NS_IMPL_ISUPPORTS1(WindowCreator, nsIWindowCreator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
WindowCreator::CreateWindow(nsIWebBrowserChrome *parent,
|
||||
PRUint32 chromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
|
||||
PRUint32 chromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
::CreateBrowserWindow(PRInt32(chromeFlags), parent, _retval);
|
||||
|
|
|
@ -70,9 +70,9 @@ nsWindowCreator::~nsWindowCreator() {
|
|||
NS_IMPL_ISUPPORTS1(nsWindowCreator, nsIWindowCreator)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsWindowCreator::CreateWindow(nsIWebBrowserChrome *aParent,
|
||||
PRUint32 aChromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
nsWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent,
|
||||
PRUint32 aChromeFlags,
|
||||
nsIWebBrowserChrome **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
*_retval = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче