diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 1c45745e7e79..ad3d1ba8b5cf 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -1564,7 +1564,6 @@ PRBool nsDOMClassInfo::sDisableDocumentAllSupport = PR_FALSE;
PRBool nsDOMClassInfo::sDisableGlobalScopePollutionSupport = PR_FALSE;
-jsid nsDOMClassInfo::sTop_id = JSID_VOID;
jsid nsDOMClassInfo::sParent_id = JSID_VOID;
jsid nsDOMClassInfo::sScrollbars_id = JSID_VOID;
jsid nsDOMClassInfo::sLocation_id = JSID_VOID;
@@ -1899,7 +1898,6 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
JSAutoRequest ar(cx);
- SET_JSID_TO_STRING(sTop_id, cx, "top");
SET_JSID_TO_STRING(sParent_id, cx, "parent");
SET_JSID_TO_STRING(sScrollbars_id, cx, "scrollbars");
SET_JSID_TO_STRING(sLocation_id, cx, "location");
@@ -5022,7 +5020,6 @@ nsDOMClassInfo::ShutDown()
}
}
- sTop_id = JSID_VOID;
sParent_id = JSID_VOID;
sScrollbars_id = JSID_VOID;
sLocation_id = JSID_VOID;
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index d1acc46fc6cb..0c9f88d609ae 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -202,8 +202,7 @@ protected:
static inline PRBool IsReadonlyReplaceable(jsid id)
{
- return (id == sTop_id ||
- id == sParent_id ||
+ return (id == sParent_id ||
id == sScrollbars_id ||
id == sContent_id ||
id == sMenubar_id ||
@@ -246,7 +245,6 @@ protected:
static PRBool sDisableGlobalScopePollutionSupport;
public:
- static jsid sTop_id;
static jsid sParent_id;
static jsid sScrollbars_id;
static jsid sLocation_id;
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 3c44bc79a63a..3228d2185eae 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -138,6 +138,7 @@ _TEST_FILES = \
test_bug633133.html \
test_bug642026.html \
test_bug648465.html \
+ test_bug654137.html \
test_window_bar.html \
file_window_bar.html \
$(NULL)
diff --git a/dom/tests/mochitest/bugs/test_bug654137.html b/dom/tests/mochitest/bugs/test_bug654137.html
new file mode 100644
index 000000000000..331e323e1179
--- /dev/null
+++ b/dom/tests/mochitest/bugs/test_bug654137.html
@@ -0,0 +1,26 @@
+
+
+
+
+ Test for Bug 654137
+
+
+
+
+
+Mozilla Bug 654137
+
+
+
+
+
+
+
+
diff --git a/toolkit/content/tests/widgets/test_contextmenu_list.xul b/toolkit/content/tests/widgets/test_contextmenu_list.xul
index 35e11ba4248d..938777ee81d2 100644
--- a/toolkit/content/tests/widgets/test_contextmenu_list.xul
+++ b/toolkit/content/tests/widgets/test_contextmenu_list.xul
@@ -184,8 +184,8 @@ function checkContextMenu(event)
var frombase = (gTestId == -1 || gTestId == 1);
if (!frombase)
rect = event.originalTarget.getBoundingClientRect();
- left = frombase ? rect.left + 7 : rect.left;
- top = frombase ? rect.top + 4 : rect.bottom;
+ var left = frombase ? rect.left + 7 : rect.left;
+ var top = frombase ? rect.top + 4 : rect.bottom;
isRoundedX(event.clientX, left, gTestElement + " clientX " + gSelectionStep + " " + gTestId + "," + frombase);
isRoundedY(event.clientY, top, gTestElement + " clientY " + gSelectionStep + " " + gTestId);