Mozilla/mozilla/java/webclient/src_moz/WindowCreator.cpp
edburns%acm.org 8ca3c70a3a This change-bundle allows Webclient to work on Mac OS X Cocoa.
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java

- The base class for all native browser controls

M build.xml

- rm -rf dist/classes on clean

M dist/mcp-test/src/test/java/cardemo/CarDemoTest.java

- disable, due to https://bugzilla.mozilla.org/show_bug.cgi?id=366619
  not being fixed on FIREFOX_2_0_0_3_RELEASE branch.

M dom/jni/nativeDOMProxyListener.cpp

- Need extra void ** cast for first argument to AttachCurrentThread

M dom/jni/org_mozilla_dom_ElementImpl.cpp

- modify handleInterceptableAttr to adjust screenX,screenY per cross
  platform fudge factors.

M dom/src/nsJavaDOMImpl.cpp

- use %p instead of %x when printing out pointers

- Need extra void ** cast for first argument to AttachCurrentThread

M webclient/classes_spec/org/mozilla/mcp/MCP.java

- remove fudge factor, moved into DOM layer.

M webclient/classes_spec/org/mozilla/webclient/BrowserControlCanvas.java

- add logging

- push some code down to NativeBrowserControlCanvas

M webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java

- change the contract of how a new window event is handled.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaAppKitThreadDelegatingNativeEventThread.java

- correctly case where exception is thrown on the AppKit thread when
  doing a ReturnRunnable.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java

- make this extend NativeBrowserControlCanvas

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java

- new contract for NewWindowListener

M webclient/src_moz/NativeEventThread.cpp

- fix compiler warning.

M webclient/src_moz/WindowCreator.cpp

- add logging

M webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java
M webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java
M webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java
M webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java

- use dom to get the screen coordinates of elements on which to click,
  instead of using hard coded screen coordinates, which are not cross
  platform friendly.

M webclient/test/automated/src/test/WindowCreatorTest0.html

- add ids to some elements for use in testcases.


git-svn-id: svn://10.0.0.236/trunk@228340 18797224-902f-48f8-a5cc-f745e15eee43
2007-06-19 20:18:13 +00:00

139 lines
4.5 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"
#include "NativeBrowserControl.h"
#include "EmbedEventListener.h"
#include "EmbedWindow.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)
{
nsresult rv = NS_OK;
PRBool hasNewWindowListener = PR_FALSE;
NativeBrowserControl *newNativeBrowserControl = nsnull;
jint newNativeBCPtr = -1;
JNIEnv *env = (JNIEnv *) JNU_GetEnv(gVm, JNI_VERSION);
rv = mNativeBCPtr->GetNewWindowListenerAttached(&hasNewWindowListener);
if (NS_FAILED(rv) || !hasNewWindowListener) {
return rv;
}
nsCOMPtr<nsIWebBrowser> webBrowser;
parent->GetWebBrowser(getter_AddRefs(webBrowser));
nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(webBrowser));
if (nsnull != baseWindow) {
jobject eventRegistration = nsnull;
rv = mNativeBCPtr->mEventListener->GetEventRegistration(&eventRegistration);
if (NS_FAILED(rv) || !eventRegistration) {
return rv;
}
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
("WindowCreater::CreateChromeWindow2: About to call back to Java to get new native window.\n"));
// send this event to allow the user to create the new BrowserControl
newNativeBCPtr = util_SendEventToJava(nsnull,
eventRegistration,
NEW_WINDOW_LISTENER_CLASSNAME,
chromeFlags, nsnull);
newNativeBrowserControl = (NativeBrowserControl *) newNativeBCPtr;
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
("WindowCreater::CreateChromeWindow2: nativeBrowserControl: %p new nsIWebBrowserChrome: %p.\n", newNativeBrowserControl, newNativeBrowserControl->mWindow));
PR_ASSERT(nsnull != newNativeBrowserControl);
nsCOMPtr<nsIWebBrowserChrome> webChrome(newNativeBrowserControl->mWindow);
*_retval = webChrome;
NS_IF_ADDREF(*_retval);
}
return NS_OK;
}