diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
index da3fbadb322..c13523fd3c8 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
@@ -112,16 +112,22 @@ CWebShellContainer::MoveTo(PRInt32 aX, PRInt32 aY)
 
 
 NS_IMETHODIMP
-CWebShellContainer::SizeTo(PRInt32 aWidth, PRInt32 aHeight)
+CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
+{
+	return NS_OK;
+}
+
+NS_IMETHODIMP
+CWebShellContainer::SizeContentTo(PRInt32 aWidth, PRInt32 aHeight)
 {
 	return NS_OK;
 }
 
 
 NS_IMETHODIMP
-CWebShellContainer::GetBounds(nsRect& aResult)
+CWebShellContainer::GetContentBounds(nsRect& aResult)
 {
-	NG_TRACE_METHOD(CWebShellContainer::GetBounds);
+	NG_TRACE_METHOD(CWebShellContainer::GetContentBounds);
 	return NS_OK;
 }
 
@@ -129,10 +135,18 @@ CWebShellContainer::GetBounds(nsRect& aResult)
 NS_IMETHODIMP
 CWebShellContainer::GetWindowBounds(nsRect& aResult)
 {
+	NG_TRACE_METHOD(CWebShellContainer::GetWindowBounds);
 	return NS_OK;
 }
 
 
+NS_IMETHODIMP
+CWebShellContainer::IsIntrinsicallySized(PRBool& aResult)
+{
+    aResult = PR_FALSE;
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 CWebShellContainer::Show()
 {
@@ -445,7 +459,7 @@ CWebShellContainer::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCo
 // nsIStreamObserver implementation
 #ifdef NECKO
 NS_IMETHODIMP
-CWebShellContainer::OnStartRequest(nsISupports* aContext)
+CWebShellContainer::OnStartRequest(nsIChannel* aChannel, nsISupports* aContext)
 {
 	USES_CONVERSION;
 	NG_TRACE(_T("CWebShellContainer::OnStartRequest(...)\n"));
@@ -453,7 +467,7 @@ CWebShellContainer::OnStartRequest(nsISupports* aContext)
 }
 
 NS_IMETHODIMP
-CWebShellContainer::OnStopRequest(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg)
+CWebShellContainer::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg)
 {
 	USES_CONVERSION;
 	NG_TRACE(_T("CWebShellContainer::OnStopRequest(..., %d, \"%s\")\n"), (int) aStatus, W2T((PRUnichar *) aMsg));
diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h
index 9179a81eef0..4928c9cdf8a 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h
@@ -48,9 +48,14 @@ public:
 	// nsIBrowserWindow
 	NS_IMETHOD Init(nsIAppShell* aAppShell, nsIPref* aPrefs, const nsRect& aBounds, PRUint32 aChromeMask, PRBool aAllowPlugins = PR_TRUE);
 	NS_IMETHOD MoveTo(PRInt32 aX, PRInt32 aY);
-	NS_IMETHOD SizeTo(PRInt32 aWidth, PRInt32 aHeight);
-	NS_IMETHOD GetBounds(nsRect& aResult);
-	NS_IMETHOD GetWindowBounds(nsRect& aResult);
+
+    NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight);
+    NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight);
+
+    NS_IMETHOD GetContentBounds(nsRect& aResult);
+    NS_IMETHOD GetWindowBounds(nsRect& aResult);
+    NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
+
 	NS_IMETHOD Show();
 	NS_IMETHOD Hide();
 	NS_IMETHOD Close();
@@ -85,8 +90,8 @@ public:
 
 #ifdef NECKO
 	// nsIStreamObserver
-    NS_IMETHOD OnStartRequest(nsISupports* aContext);
-    NS_IMETHOD OnStopRequest(nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg);
+    NS_IMETHOD OnStartRequest(nsIChannel* aChannel, nsISupports* aContext);
+    NS_IMETHOD OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, nsresult aStatus, const PRUnichar* aMsg);
 
 	// nsIDocumentLoaderObserver 
 	NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand);