M build-tests.xml

- make NavigationTest not run

M build.xml

- Move Win32BrowserControlCanvas up to parent package

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

- You can't resize until you're initialized

- pass visibility through to native layer

M classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java

- Use WrapperFactory to create the BrowserControlCanvas impl.

A classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java

- moved up from child package

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

- use the new thread model for nativeSetBounds(), nativeRealize(),
  nativeSetVisible().

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

- make this create the BrowserControlCanvas instance.

- honor the new package name for Win32BrowserControlCanvas.

R classes_spec/org/mozilla/webclient/impl/wrapper_native/win32/Win32BrowserControlCanvas.java

- moved up one level.

M src_moz/EmbedWindow.cpp
M src_moz/EmbedWindow.h

- Take size parameters to CreateWindow_

M src_moz/Makefile.in

- add WindowControlImpl.cpp

M src_moz/NativeBrowserControl.cpp
M src_moz/NativeBrowserControl.h

- add size parameters to Realize().

M src_moz/WindowControlImpl.cpp

- reactivate nativeRealize(), nativeSetVisible(), nativesetBounds(),

M src_moz/win32/Win32BrowserControlCanvas.cpp

- new package name

M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java

- we have to create a Canvas to load a URL.  Mozilla limitation.

M test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java

- remove unneeded test metdod


git-svn-id: svn://10.0.0.236/trunk@155219 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/webclient/src_moz/EmbedWindow.cpp

@@ -67,10 +67,9 @@ EmbedWindow::Init(NativeBrowserControl *aOwner)
 }
 
 nsresult
-EmbedWindow::CreateWindow_(void)
+EmbedWindow::CreateWindow_(PRUint32 width, PRUint32 height)
 {
     nsresult rv;
-    int width, height;
 #ifdef XP_UNIX
     PR_ASSERT(PR_FALSE);
     GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHWnd));
@@ -78,25 +77,23 @@ EmbedWindow::CreateWindow_(void)
     height = ownerAsWidget->allocation.height;
 #else 
     HWND ownerAsWidget = mOwner->parentHWnd;
-    width = 640; // PENDING(edburns): how to get the size of the parentHwnd
-    height = 480; 
 #endif
-
-  // Get the base window interface for the web browser object and
-  // create the window.
-  mBaseWindow = do_QueryInterface(mWebBrowser);
-  rv = mBaseWindow->InitWindow(ownerAsWidget,
-			       nsnull,
-			       0, 0, 
-			       width, height);
-  if (NS_FAILED(rv))
+    
+    // Get the base window interface for the web browser object and
+    // create the window.
+    mBaseWindow = do_QueryInterface(mWebBrowser);
+    rv = mBaseWindow->InitWindow(ownerAsWidget,
+                                 nsnull,
+                                 0, 0, 
+                                 width, height);
+    if (NS_FAILED(rv))
+        return rv;
+    
+    rv = mBaseWindow->Create();
+    if (NS_FAILED(rv))
     return rv;
-
-  rv = mBaseWindow->Create();
-  if (NS_FAILED(rv))
-    return rv;
-
-  return NS_OK;
+    
+    return NS_OK;
 }