0176a48d48
NewWindowListener mechanism. Next step will be to continue to try to get it working. A test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java A test/automated/src/test/WindowCreatorTest0.html A test/automated/src/test/WindowCreatorTest1.html - new test, currently fails. M build-tests.xml - add new test, non-running M classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java - prep for NewWindowListener M src_moz/WindowCreator.cpp - sketch implementation plan. In WindowCreator.CreateChromeWindow2: + /* + Block this thread. + + Call back into java and ask the user to create a top level + window and hand it, or an added child of it, to us. Call this + thing the userWindow. + + Create a new BrowserControl, get its BrowserControlCanvas and + make it be a child of the userWindow. + + Set the userWindow and the BrowserControlCanvas to visible == + true. This is necessary to get the cause the underlying + mozilla window to be created. + + java returns the C++ nativeBrowserControl to us. Cast it to a + native NativeBrowserControl C++ object instance. If the + nsIURI is non-null, cause the new window to navigate to that + URI. Return the NativeBrowserControl's EmbedWindow instance, + which is an impl of nsIWebBrowserChrome. + + I'm not sure if it's safe to do all this on the same thread on + which mozilla calls us. I hope so. + */ git-svn-id: svn://10.0.0.236/trunk@167522 18797224-902f-48f8-a5cc-f745e15eee43
125 lines
3.9 KiB
C++
125 lines
3.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is RaptorCanvas.
|
|
*
|
|
* The Initial Developer of the Original Code is Kirk Baker and
|
|
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
|
|
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s): Kyle Yuan <kyle.yuan@sun.com>
|
|
*/
|
|
|
|
#include "nsIWebBrowserChrome.h"
|
|
#include "nsIBaseWindow.h"
|
|
#include "nsIWebBrowser.h"
|
|
#include "WindowCreator.h"
|
|
|
|
NativeBrowserControl* gNewWindowNativeBCPtr;
|
|
|
|
NS_IMPL_ISUPPORTS2(WindowCreator, nsIWindowCreator, nsIWindowCreator2)
|
|
|
|
WindowCreator::WindowCreator(NativeBrowserControl *yourNativeBCPtr)
|
|
{
|
|
mNativeBCPtr = yourNativeBCPtr;
|
|
mTarget = 0;
|
|
}
|
|
|
|
WindowCreator::~WindowCreator()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP WindowCreator::AddNewWindowListener(jobject target)
|
|
{
|
|
if (! mTarget)
|
|
mTarget = target;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
|
|
PRUint32 chromeFlags,
|
|
nsIWebBrowserChrome **_retval)
|
|
{
|
|
if (!mTarget)
|
|
return NS_OK;
|
|
|
|
gNewWindowNativeBCPtr = nsnull;
|
|
|
|
/********
|
|
|
|
util_SendEventToJava(mNativeBCPtr->env,
|
|
mNativeBCPtr->nativeEventThread,
|
|
mTarget,
|
|
NEW_WINDOW_LISTENER_CLASSNAME,
|
|
chromeFlags,
|
|
0);
|
|
|
|
// check gNewWindowNativeBCPtr to see if the initialization had completed
|
|
while (!gNewWindowNativeBCPtr) {
|
|
processEventLoop(mNativeBCPtr);
|
|
::PR_Sleep(PR_INTERVAL_NO_WAIT);
|
|
}
|
|
|
|
nsCOMPtr<nsIWebBrowserChrome> webChrome(do_QueryInterface(gNewWindowNativeBCPtr->browserContainer));
|
|
*_retval = webChrome;
|
|
NS_IF_ADDREF(*_retval);
|
|
printf ("RET=%x\n", *_retval);
|
|
*************/
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
WindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *parent,
|
|
PRUint32 chromeFlags,
|
|
PRUint32 contextFlags,
|
|
nsIURI *uri, PRBool *cancel,
|
|
nsIWebBrowserChrome **_retval)
|
|
{
|
|
nsCOMPtr<nsIWebBrowser> webBrowser;
|
|
|
|
parent->GetWebBrowser(getter_AddRefs(webBrowser));
|
|
nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(webBrowser));
|
|
|
|
if (nsnull != baseWindow) {
|
|
/*
|
|
Block this thread.
|
|
|
|
Call back into java and ask the user to create a top level
|
|
window and hand it, or an added child of it, to us. Call this
|
|
thing the userWindow.
|
|
|
|
Create a new BrowserControl, get its BrowserControlCanvas and
|
|
make it be a child of the userWindow.
|
|
|
|
Set the userWindow and the BrowserControlCanvas to visible ==
|
|
true. This is necessary to get the cause the underlying
|
|
mozilla window to be created.
|
|
|
|
java returns the C++ nativeBrowserControl to us. Cast it to a
|
|
native NativeBrowserControl C++ object instance. If the
|
|
nsIURI is non-null, cause the new window to navigate to that
|
|
URI. Return the NativeBrowserControl's EmbedWindow instance,
|
|
which is an impl of nsIWebBrowserChrome.
|
|
|
|
I'm not sure if it's safe to do all this on the same thread on
|
|
which mozilla calls us. I hope so.
|
|
*/
|
|
|
|
printf("debug: edburns: can QI to baseWindow\n\n");
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|