diff --git a/mozilla/docshell/base/nsDocShellBase.cpp b/mozilla/docshell/base/nsDocShellBase.cpp
index 9a258f437a2..c7919ea8075 100644
--- a/mozilla/docshell/base/nsDocShellBase.cpp
+++ b/mozilla/docshell/base/nsDocShellBase.cpp
@@ -211,6 +211,26 @@ NS_IMETHODIMP nsDocShellBase::GetRootDocShell(nsIDocShell** aRootDocShell)
   return NS_OK;
 }
 
+NS_IMETHODIMP nsDocShellBase::GetZoom(float* zoom)
+{
+   NS_ENSURE_ARG_POINTER(zoom);
+
+   //XXX First Check
+	/**
+	* Set/Get the document scale factor
+	*/
+   return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDocShellBase::SetZoom(float zoom)
+{
+   //XXX First Check
+	/**
+	* Set/Get the document scale factor
+	*/
+   return NS_ERROR_FAILURE;
+}
+
 //*****************************************************************************
 // nsDocShellBase::nsIDocShellEdit
 //*****************************************************************************   
@@ -727,26 +747,6 @@ NS_IMETHODIMP nsDocShellBase::SetTitle(const PRUnichar* title)
    return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsDocShellBase::GetZoom(float* zoom)
-{
-   NS_ENSURE_ARG_POINTER(zoom);
-
-   //XXX First Check
-	/**
-	* Set/Get the document scale factor
-	*/
-   return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsDocShellBase::SetZoom(float zoom)
-{
-   //XXX First Check
-	/**
-	* Set/Get the document scale factor
-	*/
-   return NS_ERROR_FAILURE;
-}
-
 //*****************************************************************************
 // nsDocShellBase::nsIScrollable
 //*****************************************************************************   
diff --git a/mozilla/docshell/base/nsIDocShell.idl b/mozilla/docshell/base/nsIDocShell.idl
index 274bc28536b..b1c29fb572f 100644
--- a/mozilla/docshell/base/nsIDocShell.idl
+++ b/mozilla/docshell/base/nsIDocShell.idl
@@ -109,4 +109,14 @@ interface nsIDocShell : nsISupports
 	outermost DocShell.
 	*/
 	readonly attribute nsIDocShell rootDocShell;
+
+	/**
+	* Set/Get the document scale factor.  When setting this attribute, a
+	* NS_ERROR_NOT_IMPLEMENTED error may be returned by implementations
+	* not supporting zoom.  Implementations not supporting zoom should return
+	* 1.0 all the time for the Get operation.  1.0 by the way is the default
+	* of zoom.  This means 100% of normal scaling or in other words normal size
+	* no zoom. 
+	*/
+	attribute float zoom;
 };
diff --git a/mozilla/docshell/base/nsIGenericWindow.idl b/mozilla/docshell/base/nsIGenericWindow.idl
index 8f6688d989d..f3d9eae216b 100644
--- a/mozilla/docshell/base/nsIGenericWindow.idl
+++ b/mozilla/docshell/base/nsIGenericWindow.idl
@@ -179,9 +179,4 @@ interface nsIGenericWindow : nsISupports
 	void setFocus();
 
 	attribute wstring title;
-
-	/**
-	* Set/Get the document scale factor
-	*/
-	attribute float zoom;
 };
\ No newline at end of file