diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp
index 22acbfc3985..597d17d79d2 100644
--- a/mozilla/content/base/src/nsDocumentViewer.cpp
+++ b/mozilla/content/base/src/nsDocumentViewer.cpp
@@ -1505,7 +1505,8 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
       heightDelta = height - oldHeight;
       browser->GetWindowBounds(windowBounds);
       browser->SizeWindowTo(windowBounds.width + widthDelta,
-                            windowBounds.height + heightDelta);
+                            windowBounds.height + heightDelta,
+                            PR_FALSE, PR_FALSE);
     }
   }
   */
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index f905cc065e9..a0be6a592df 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -1117,7 +1117,8 @@ nsWebShell::SizeToContent()
               heightDelta = height - oldHeight;
               browser->GetWindowBounds(windowBounds);
               browser->SizeWindowTo(windowBounds.width + widthDelta,
-                                    windowBounds.height + heightDelta);
+                                    windowBounds.height + heightDelta,
+                                    PR_FALSE, PR_FALSE);
             }
           }
         }
diff --git a/mozilla/embedding/browser/activex/src/control/WebShellContainer.cpp b/mozilla/embedding/browser/activex/src/control/WebShellContainer.cpp
index cf2c2c88cd4..47f101d6ae4 100644
--- a/mozilla/embedding/browser/activex/src/control/WebShellContainer.cpp
+++ b/mozilla/embedding/browser/activex/src/control/WebShellContainer.cpp
@@ -81,7 +81,8 @@ CWebShellContainer::SizeTo(PRInt32 aWidth, PRInt32 aHeight)
 
 
 NS_IMETHODIMP
-CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
+CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                                 PRBool aWidthTransient, PRBool aHeightTransient)
 {
 	NG_TRACE_METHOD(CWebShellContainer::SizeWindowTo);
 	return NS_OK;
@@ -603,4 +604,4 @@ NS_IMETHODIMP
 CWebShellContainer::HandleUnknownContentType(nsIDocumentLoader* loader, nsIChannel *aChannel, const char *aContentType, const char *aCommand ) 
 { 
 	return NS_OK; 
-}
\ No newline at end of file
+}
diff --git a/mozilla/embedding/browser/activex/src/control/WebShellContainer.h b/mozilla/embedding/browser/activex/src/control/WebShellContainer.h
index fa5b0a5030e..4f62de622f1 100644
--- a/mozilla/embedding/browser/activex/src/control/WebShellContainer.h
+++ b/mozilla/embedding/browser/activex/src/control/WebShellContainer.h
@@ -57,7 +57,8 @@ public:
 	NS_IMETHOD GetBounds(nsRect& aResult);
 	NS_IMETHOD GetWindowBounds(nsRect& aResult);
 	NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
-	NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight);
+	NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                                PRBool aWidthTransient, PRBool aHeightTransient);
 	NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight);
 	NS_IMETHOD ShowAfterCreation();
 	NS_IMETHOD Show();
diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp
index 22acbfc3985..597d17d79d2 100644
--- a/mozilla/layout/base/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/nsDocumentViewer.cpp
@@ -1505,7 +1505,8 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
       heightDelta = height - oldHeight;
       browser->GetWindowBounds(windowBounds);
       browser->SizeWindowTo(windowBounds.width + widthDelta,
-                            windowBounds.height + heightDelta);
+                            windowBounds.height + heightDelta,
+                            PR_FALSE, PR_FALSE);
     }
   }
   */
diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp
index 22acbfc3985..597d17d79d2 100644
--- a/mozilla/layout/base/src/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/src/nsDocumentViewer.cpp
@@ -1505,7 +1505,8 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
       heightDelta = height - oldHeight;
       browser->GetWindowBounds(windowBounds);
       browser->SizeWindowTo(windowBounds.width + widthDelta,
-                            windowBounds.height + heightDelta);
+                            windowBounds.height + heightDelta,
+                            PR_FALSE, PR_FALSE);
     }
   }
   */
diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
index cf2c2c88cd4..4b41c99f702 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
@@ -81,7 +81,8 @@ CWebShellContainer::SizeTo(PRInt32 aWidth, PRInt32 aHeight)
 
 
 NS_IMETHODIMP
-CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
+CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                                 PRBool aWidthTransient, PRBool aHeightTransient)
 {
 	NG_TRACE_METHOD(CWebShellContainer::SizeWindowTo);
 	return NS_OK;
@@ -603,4 +604,5 @@ NS_IMETHODIMP
 CWebShellContainer::HandleUnknownContentType(nsIDocumentLoader* loader, nsIChannel *aChannel, const char *aContentType, const char *aCommand ) 
 { 
 	return NS_OK; 
-}
\ No newline at end of file
+}
+
diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h
index fa5b0a5030e..28cd6be0811 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h
@@ -57,7 +57,8 @@ public:
 	NS_IMETHOD GetBounds(nsRect& aResult);
 	NS_IMETHOD GetWindowBounds(nsRect& aResult);
 	NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
-	NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight);
+	NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                                PRBool aWidthTransient, PRBool aHeightTransient);
 	NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight);
 	NS_IMETHOD ShowAfterCreation();
 	NS_IMETHOD Show();
@@ -109,3 +110,4 @@ public:
 };
 
 #endif
+
diff --git a/mozilla/webshell/public/nsIBrowserWindow.h b/mozilla/webshell/public/nsIBrowserWindow.h
index f2b88020d3d..95c2fab4f5f 100644
--- a/mozilla/webshell/public/nsIBrowserWindow.h
+++ b/mozilla/webshell/public/nsIBrowserWindow.h
@@ -73,7 +73,8 @@ public:
 
   NS_IMETHOD MoveTo(PRInt32 aX, PRInt32 aY) = 0;
 
-  NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight) = 0;
+  NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                          PRBool aWidthTransient, PRBool aHeightTransient) = 0;
   NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight) = 0;
 
   NS_IMETHOD GetContentBounds(nsRect& aResult) = 0;
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index f905cc065e9..a0be6a592df 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -1117,7 +1117,8 @@ nsWebShell::SizeToContent()
               heightDelta = height - oldHeight;
               browser->GetWindowBounds(windowBounds);
               browser->SizeWindowTo(windowBounds.width + widthDelta,
-                                    windowBounds.height + heightDelta);
+                                    windowBounds.height + heightDelta,
+                                    PR_FALSE, PR_FALSE);
             }
           }
         }
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index 22f9e7c73a6..230495e9253 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -1646,7 +1646,9 @@ nsBrowserWindow::SizeContentTo(PRInt32 aWidth, PRInt32 aHeight)
 }
 
 NS_IMETHODIMP
-nsBrowserWindow::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
+nsBrowserWindow::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                              PRBool /*aWidthTransient*/,
+                              PRBool /*aHeightTransient*/)
 {
   return SizeContentTo(aWidth, aHeight);
 }
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h
index e90bab599e8..b65e61dd2bc 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h
@@ -85,7 +85,8 @@ public:
   // nsIBrowserWindow
   NS_IMETHOD MoveTo(PRInt32 aX, PRInt32 aY);
   NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight);
-  NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight,
+                          PRBool aWidthTransient, PRBool aHeightTransient);
   NS_IMETHOD GetContentBounds(nsRect& aBounds);
   NS_IMETHOD GetWindowBounds(nsRect& aBounds);
   NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
index e323e6d552e..e431114cd14 100644
--- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
+++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
@@ -344,11 +344,11 @@ nsWebCrawler::OnEndDocumentLoad(nsIDocumentLoader* loader,
       nscoord oldWidth = r.width;
       while (r.width > 100) {
         r.width -= 10;
-        mBrowser->SizeWindowTo(r.width, r.height);
+        mBrowser->SizeWindowTo(r.width, r.height, PR_FALSE, PR_FALSE);
       }
       while (r.width < oldWidth) {
         r.width += 10;
-        mBrowser->SizeWindowTo(r.width, r.height);
+        mBrowser->SizeWindowTo(r.width, r.height, PR_FALSE, PR_FALSE);
       }
     }