diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp
index a80dd592335..b89989a6c18 100644
--- a/mozilla/layout/forms/nsIsIndexFrame.cpp
+++ b/mozilla/layout/forms/nsIsIndexFrame.cpp
@@ -241,6 +241,15 @@ nsIsIndexFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
   return result;
 }
 
+NS_IMETHODIMP
+nsIsIndexFrame::SetDocumentForAnonymousContent(nsIDocument* aDocument,
+                                                   PRBool aDeep,
+                                                   PRBool aCompileEventHandlers)
+{
+  // XXX WRITE ME
+  return NS_OK;
+}
+
 // Frames are not refcounted, no need to AddRef
 NS_IMETHODIMP
 nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
@@ -296,9 +305,11 @@ nsIsIndexFrame::AttributeChanged(nsIPresContext* aPresContext,
 {
   nsresult rv = NS_OK;
   if (nsHTMLAtoms::prompt == aAttribute) {
-    UpdatePromptLabel();
+    rv = UpdatePromptLabel();
+  } else {
+    rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint);
   }
-  return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint);
+  return rv;
 }
 
 
@@ -426,7 +437,6 @@ nsIsIndexFrame::OnSubmit(nsIPresContext* aPresContext)
     if (NS_FAILED(result)) return result;
 
     // Now pass on absolute url to the click handler
-    nsIInputStream* postDataStream = nsnull;
     if (handler) {
       handler->OnLinkClick(mContent, eLinkVerb_Replace,
                            absURLSpec.GetUnicode(),
diff --git a/mozilla/layout/forms/nsIsIndexFrame.h b/mozilla/layout/forms/nsIsIndexFrame.h
index a38eee94944..bde7d9eb277 100644
--- a/mozilla/layout/forms/nsIsIndexFrame.h
+++ b/mozilla/layout/forms/nsIsIndexFrame.h
@@ -107,6 +107,9 @@ public:
   // from nsIAnonymousContentCreator
   NS_IMETHOD CreateAnonymousContent(nsIPresContext* aPresContext,
                                     nsISupportsArray& aChildList);
+  NS_IMETHOD SetDocumentForAnonymousContent(nsIDocument* aDocument,
+                                            PRBool aDeep,
+                                            PRBool aCompileEventHandlers);
   NS_IMETHOD CreateFrameFor(nsIPresContext*   aPresContext,
                             nsIContent *      aContent,
                             nsIFrame**        aFrame) { if (aFrame) *aFrame = nsnull; return NS_ERROR_FAILURE; }
@@ -121,8 +124,8 @@ public:
   NS_IMETHOD RestoreState(nsIPresContext* aPresContext, nsIPresState* aState);
 
 protected:
-  nsIHTMLContent*     mInputContent;
   nsIHTMLContent*     mTextContent;
+  nsIHTMLContent*     mInputContent;
 
   // XXX Hack: pres context needed by function KeyPress() and SetFocus()
   nsIPresContext*     mPresContext;  // weak reference
diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp
index a80dd592335..b89989a6c18 100644
--- a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp
@@ -241,6 +241,15 @@ nsIsIndexFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
   return result;
 }
 
+NS_IMETHODIMP
+nsIsIndexFrame::SetDocumentForAnonymousContent(nsIDocument* aDocument,
+                                                   PRBool aDeep,
+                                                   PRBool aCompileEventHandlers)
+{
+  // XXX WRITE ME
+  return NS_OK;
+}
+
 // Frames are not refcounted, no need to AddRef
 NS_IMETHODIMP
 nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
@@ -296,9 +305,11 @@ nsIsIndexFrame::AttributeChanged(nsIPresContext* aPresContext,
 {
   nsresult rv = NS_OK;
   if (nsHTMLAtoms::prompt == aAttribute) {
-    UpdatePromptLabel();
+    rv = UpdatePromptLabel();
+  } else {
+    rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint);
   }
-  return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint);
+  return rv;
 }
 
 
@@ -426,7 +437,6 @@ nsIsIndexFrame::OnSubmit(nsIPresContext* aPresContext)
     if (NS_FAILED(result)) return result;
 
     // Now pass on absolute url to the click handler
-    nsIInputStream* postDataStream = nsnull;
     if (handler) {
       handler->OnLinkClick(mContent, eLinkVerb_Replace,
                            absURLSpec.GetUnicode(),
diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.h b/mozilla/layout/html/forms/src/nsIsIndexFrame.h
index a38eee94944..bde7d9eb277 100644
--- a/mozilla/layout/html/forms/src/nsIsIndexFrame.h
+++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.h
@@ -107,6 +107,9 @@ public:
   // from nsIAnonymousContentCreator
   NS_IMETHOD CreateAnonymousContent(nsIPresContext* aPresContext,
                                     nsISupportsArray& aChildList);
+  NS_IMETHOD SetDocumentForAnonymousContent(nsIDocument* aDocument,
+                                            PRBool aDeep,
+                                            PRBool aCompileEventHandlers);
   NS_IMETHOD CreateFrameFor(nsIPresContext*   aPresContext,
                             nsIContent *      aContent,
                             nsIFrame**        aFrame) { if (aFrame) *aFrame = nsnull; return NS_ERROR_FAILURE; }
@@ -121,8 +124,8 @@ public:
   NS_IMETHOD RestoreState(nsIPresContext* aPresContext, nsIPresState* aState);
 
 protected:
-  nsIHTMLContent*     mInputContent;
   nsIHTMLContent*     mTextContent;
+  nsIHTMLContent*     mInputContent;
 
   // XXX Hack: pres context needed by function KeyPress() and SetFocus()
   nsIPresContext*     mPresContext;  // weak reference