WinForms - If the ChromiumWebBrowser has it's handle recreated then i…

…n OnHandleCreated we will now attempt to reparent a existing instance rather than creating a new browser

# Conflicts:
#	CefSharp.WinForms/ChromiumWebBrowser.cs

CefSharp.Core/NativeMethodWrapper.cpp

@@ -37,4 +37,12 @@ namespace CefSharp
             }
         }
     }
+
+    void NativeMethodWrapper::SetWindowParent(IntPtr child, IntPtr newParent)
+    {
+        HWND childHwnd = static_cast<HWND>(child.ToPointer());
+        HWND newParentHwnd = static_cast<HWND>(newParent.ToPointer());
+
+        SetParent(childHwnd, newParentHwnd);
+    }
 }

CefSharp.Core/NativeMethodWrapper.h

@@ -14,5 +14,6 @@ namespace CefSharp
         static void CopyMemoryUsingHandle(IntPtr dest, IntPtr src, int numberOfBytes);
         static bool IsFocused(IntPtr handle);
         static void SetWindowPosition(IntPtr handle, int x, int y, int width, int height);
+        static void SetWindowParent(IntPtr child, IntPtr newParent);
     };
 }

CefSharp.WinForms/ChromiumWebBrowser.cs

@@ -552,7 +552,16 @@ private void CreateBrowser()
 
             if (((IWebBrowserInternal)this).HasParent == false)
             {
-                managedCefBrowserAdapter.CreateBrowser(BrowserSettings, (RequestContext)requestContext, Handle, Address);
+                if(IsBrowserInitialized == false || browser == null)
+                { 
+                    managedCefBrowserAdapter.CreateBrowser(BrowserSettings, (RequestContext)RequestContext, Handle, Address);
+                }
+                else
+                {
+                    //If the browser already exists we'll reparent it to the new Handle
+                    var browserHandle = browser.GetHost().GetWindowHandle();
+                    NativeMethodWrapper.SetWindowParent(browserHandle, Handle);
+                }
             }
         }