diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index b5b92525534..5882345272f 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -236,8 +236,9 @@ public:
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent);
-  NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                 nsIContent* aContent);
+  NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2);
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
                               nsIAtom*     aAttribute,
@@ -1704,13 +1705,14 @@ PresShell::ContentChanged(nsIDocument *aDocument,
 }
 
 NS_IMETHODIMP
-PresShell::ContentStateChanged(nsIDocument* aDocument,
-                               nsIContent* aContent)
+PresShell::ContentStatesChanged(nsIDocument* aDocument,
+                                nsIContent* aContent1,
+                                nsIContent* aContent2)
 {
   NS_PRECONDITION(nsnull != mRootFrame, "null root frame");
 
   EnterReflowLock();
-  nsresult rv = mStyleSet->ContentStateChanged(mPresContext, aContent);
+  nsresult rv = mStyleSet->ContentStatesChanged(mPresContext, aContent1, aContent2);
   ExitReflowLock();
   //if (mSelection)
     //mSelection->ResetSelection(this, mRootFrame);
diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp
index 31850c74fd0..9473b8fd582 100644
--- a/mozilla/layout/generic/nsImageMap.cpp
+++ b/mozilla/layout/generic/nsImageMap.cpp
@@ -980,8 +980,9 @@ nsImageMap::ContentChanged(nsIDocument *aDocument,
 }
 
 NS_IMETHODIMP
-nsImageMap::ContentStateChanged(nsIDocument* aDocument,
-                                nsIContent* aContent)
+nsImageMap::ContentStatesChanged(nsIDocument* aDocument,
+                                 nsIContent* aContent1,
+                                 nsIContent* aContent2)
 {
   return NS_OK;
 }
diff --git a/mozilla/layout/generic/nsImageMap.h b/mozilla/layout/generic/nsImageMap.h
index e85f630b053..f4f5367035b 100644
--- a/mozilla/layout/generic/nsImageMap.h
+++ b/mozilla/layout/generic/nsImageMap.h
@@ -75,8 +75,9 @@ public:
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent);
-  NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                 nsIContent* aContent);
+  NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2);
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
                               nsIAtom*     aAttribute,
diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp
index 31850c74fd0..9473b8fd582 100644
--- a/mozilla/layout/html/base/src/nsImageMap.cpp
+++ b/mozilla/layout/html/base/src/nsImageMap.cpp
@@ -980,8 +980,9 @@ nsImageMap::ContentChanged(nsIDocument *aDocument,
 }
 
 NS_IMETHODIMP
-nsImageMap::ContentStateChanged(nsIDocument* aDocument,
-                                nsIContent* aContent)
+nsImageMap::ContentStatesChanged(nsIDocument* aDocument,
+                                 nsIContent* aContent1,
+                                 nsIContent* aContent2)
 {
   return NS_OK;
 }
diff --git a/mozilla/layout/html/base/src/nsImageMap.h b/mozilla/layout/html/base/src/nsImageMap.h
index e85f630b053..f4f5367035b 100644
--- a/mozilla/layout/html/base/src/nsImageMap.h
+++ b/mozilla/layout/html/base/src/nsImageMap.h
@@ -75,8 +75,9 @@ public:
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent);
-  NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                 nsIContent* aContent);
+  NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2);
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
                               nsIAtom*     aAttribute,
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index b5b92525534..5882345272f 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -236,8 +236,9 @@ public:
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent);
-  NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                 nsIContent* aContent);
+  NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2);
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
                               nsIAtom*     aAttribute,
@@ -1704,13 +1705,14 @@ PresShell::ContentChanged(nsIDocument *aDocument,
 }
 
 NS_IMETHODIMP
-PresShell::ContentStateChanged(nsIDocument* aDocument,
-                               nsIContent* aContent)
+PresShell::ContentStatesChanged(nsIDocument* aDocument,
+                                nsIContent* aContent1,
+                                nsIContent* aContent2)
 {
   NS_PRECONDITION(nsnull != mRootFrame, "null root frame");
 
   EnterReflowLock();
-  nsresult rv = mStyleSet->ContentStateChanged(mPresContext, aContent);
+  nsresult rv = mStyleSet->ContentStatesChanged(mPresContext, aContent1, aContent2);
   ExitReflowLock();
   //if (mSelection)
     //mSelection->ResetSelection(this, mRootFrame);
diff --git a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
index c8e0c00d36d..9fbe4c99a27 100644
--- a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
@@ -732,8 +732,9 @@ struct nsFileDownloadDialog : public nsIXULWindowCallbacks,
     NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                               nsIContent* aContent,
                               nsISupports* aSubContent) { return NS_OK; }
-    NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                   nsIContent* aContent) { return NS_OK; }
+    NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                    nsIContent* aContent1,
+                                    nsIContent* aContent2) { return NS_OK; }
     // This one we care about; see implementation below.
     NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                                 nsIContent*  aContent,
diff --git a/mozilla/xpfe/AppCores/src/nsDOMPropsCore.cpp b/mozilla/xpfe/AppCores/src/nsDOMPropsCore.cpp
index f308952ed05..223ceb4d693 100644
--- a/mozilla/xpfe/AppCores/src/nsDOMPropsCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsDOMPropsCore.cpp
@@ -83,8 +83,9 @@ struct nsPropertiesDialog : public nsIXULWindowCallbacks,
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent)         { return NS_OK; }
-  NS_IMETHOD ContentStateChanged(nsIDocument* aDocument,
-                                 nsIContent* aContent)        { return NS_OK; }
+  NS_IMETHOD ContentStatesChanged(nsIDocument* aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2)        { return NS_OK; }
   // This one we care about; see implementation below.
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index 9cf2881e074..b72befb3a4c 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -1523,8 +1523,9 @@ nsWebShellWindow::ContentChanged(nsIDocument *aDocument,
 }
 
 NS_IMETHODIMP
-nsWebShellWindow::ContentStateChanged(nsIDocument *aDocument,
-                                      nsIContent* aContent)
+nsWebShellWindow::ContentStatesChanged(nsIDocument *aDocument,
+                                       nsIContent* aContent1,
+                                       nsIContent* aContent2)
 {
   return NS_OK;
 }
diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
index a0a447bbfef..c379313196c 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
@@ -137,8 +137,9 @@ public:
   NS_IMETHOD ContentChanged(nsIDocument *aDocument,
                             nsIContent* aContent,
                             nsISupports* aSubContent);
-  NS_IMETHOD ContentStateChanged(nsIDocument *aDocument,
-                                 nsIContent* aContent);
+  NS_IMETHOD ContentStatesChanged(nsIDocument *aDocument,
+                                  nsIContent* aContent1,
+                                  nsIContent* aContent2);
   NS_IMETHOD AttributeChanged(nsIDocument *aDocument,
                               nsIContent*  aContent,
                               nsIAtom*     aAttribute,