diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h
index ab1909fa50b..3396963de8c 100644
--- a/mozilla/layout/base/public/nsIFrame.h
+++ b/mozilla/layout/base/public/nsIFrame.h
@@ -988,8 +988,6 @@ public:
    */
   NS_IMETHOD  Scrolled(nsIView *aView) = 0;
 
-
-
   /** Selection related calls
    */
   /** 
@@ -1028,6 +1026,14 @@ public:
   /** EndSelection related calls
    */
 
+  /**
+   *  Call to turn on/off mouseCapture at the view level. Needed by the ESM so
+   *  it must be in the public interface.
+   *  @param aPresContext presContext associated with the frame
+   *  @param aGrabMouseEvents PR_TRUE to enable capture, PR_FALSE to disable
+   */
+  NS_IMETHOD CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents) = 0;
+
   /**
    *  called to find the previous/next character, word, or line  returns the actual 
    *  nsIFrame and the frame offset.  THIS DOES NOT CHANGE SELECTION STATE
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index ba12ce9b163..1ae32ea22ed 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -3515,7 +3515,7 @@ nsresult nsFrame::CreateAndPostReflowCommand(nsIPresShell*                aPresS
 }
 
 
-nsresult
+NS_IMETHODIMP
 nsFrame::CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents)
 {
     // get its view
diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h
index 54f00104ced..c369703e23b 100644
--- a/mozilla/layout/generic/nsFrame.h
+++ b/mozilla/layout/generic/nsFrame.h
@@ -354,7 +354,7 @@ public:
                                              nsIAtom*                     aListName);
 
   //Mouse Capturing code used by the frames to tell the view to capture all the following events
-  nsresult CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents);
+  NS_IMETHOD CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents);
   PRBool   IsMouseCaptured(nsIPresContext* aPresContext);
 
 #ifdef NS_DEBUG
diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h
index ab1909fa50b..3396963de8c 100644
--- a/mozilla/layout/generic/nsIFrame.h
+++ b/mozilla/layout/generic/nsIFrame.h
@@ -988,8 +988,6 @@ public:
    */
   NS_IMETHOD  Scrolled(nsIView *aView) = 0;
 
-
-
   /** Selection related calls
    */
   /** 
@@ -1028,6 +1026,14 @@ public:
   /** EndSelection related calls
    */
 
+  /**
+   *  Call to turn on/off mouseCapture at the view level. Needed by the ESM so
+   *  it must be in the public interface.
+   *  @param aPresContext presContext associated with the frame
+   *  @param aGrabMouseEvents PR_TRUE to enable capture, PR_FALSE to disable
+   */
+  NS_IMETHOD CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents) = 0;
+
   /**
    *  called to find the previous/next character, word, or line  returns the actual 
    *  nsIFrame and the frame offset.  THIS DOES NOT CHANGE SELECTION STATE
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index ba12ce9b163..1ae32ea22ed 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -3515,7 +3515,7 @@ nsresult nsFrame::CreateAndPostReflowCommand(nsIPresShell*                aPresS
 }
 
 
-nsresult
+NS_IMETHODIMP
 nsFrame::CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents)
 {
     // get its view
diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h
index 54f00104ced..c369703e23b 100644
--- a/mozilla/layout/html/base/src/nsFrame.h
+++ b/mozilla/layout/html/base/src/nsFrame.h
@@ -354,7 +354,7 @@ public:
                                              nsIAtom*                     aListName);
 
   //Mouse Capturing code used by the frames to tell the view to capture all the following events
-  nsresult CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents);
+  NS_IMETHOD CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents);
   PRBool   IsMouseCaptured(nsIPresContext* aPresContext);
 
 #ifdef NS_DEBUG