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/NativeBrowserControl.cpp

@@ -83,9 +83,29 @@ NativeBrowserControl::Init()
 }
 
 nsresult
-NativeBrowserControl::Realize(void *parentWinPtr, PRBool *aAlreadyRealized)
+NativeBrowserControl::Realize(void *parentWinPtr, PRBool *aAlreadyRealized,
+                              PRUint32 width, PRUint32 height)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+    // Create our session history object and tell the navigation object
+    // to use it.  We need to do this before we create the web browser
+    // window.
+    mSessionHistory = do_CreateInstance(NS_SHISTORY_CONTRACTID);
+    mNavigation->SetSessionHistory(mSessionHistory);
+
+#ifdef XP_UNIX
+    PR_ASSERT(PR_FALSE);
+    GtkWidget *ownerAsWidget (GTK_WIDGET(parentWinPtr));
+    parentHWnd = ownerAsWidget;
+    width = ownerAsWidget->allocation.width;
+    height = ownerAsWidget->allocation.height;
+#else 
+    parentHWnd = (HWND) parentWinPtr;
+#endif
+
+    // create the window
+    mWindow->CreateWindow_(width, height);
+    
+    return NS_OK;
 }
 
 void
@@ -96,16 +116,34 @@ NativeBrowserControl::Unrealize(void)
 void
 NativeBrowserControl::Show(void)
 {
+    // Get the nsIWebBrowser object for our embedded window.
+    nsCOMPtr<nsIWebBrowser> webBrowser;
+    mWindow->GetWebBrowser(getter_AddRefs(webBrowser));
+    
+    // and set the visibility on the thing
+    nsCOMPtr<nsIBaseWindow> baseWindow = do_QueryInterface(webBrowser);
+    baseWindow->SetVisibility(PR_TRUE);
 }
 
 void
 NativeBrowserControl::Hide(void)
 {
+    // Get the nsIWebBrowser object for our embedded window.
+    nsCOMPtr<nsIWebBrowser> webBrowser;
+    mWindow->GetWebBrowser(getter_AddRefs(webBrowser));
+    
+    // and set the visibility on the thing
+    nsCOMPtr<nsIBaseWindow> baseWindow = do_QueryInterface(webBrowser);
+    baseWindow->SetVisibility(PR_FALSE);
 }
 
 void
-NativeBrowserControl::Resize(PRUint32 aWidth, PRUint32 aHeight)
+NativeBrowserControl::Resize(PRUint32 x, PRUint32 y,
+                             PRUint32 aWidth, PRUint32 aHeight)
 {
+    mWindow->SetDimensions(nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION |
+                           nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER,
+                           x, y, aWidth, aHeight);
 }
 
 void