From 983b4e69576e6d5c67f0d902c8224931b6657359 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Thu, 28 Apr 2011 16:13:03 -0400 Subject: [PATCH] Bug 653364 - HashChange event should have isTrusted property. r=bz --HG-- extra : rebase_source : 6829b06980ed01c38e0cc5b88a9428fc784c1bb0 --- dom/base/nsDOMClassInfo.cpp | 2 +- dom/tests/mochitest/general/Makefile.in | 1 + .../mochitest/general/test_bug628069_1.html | 1 + .../mochitest/general/test_bug628069_2.html | 1 + .../mochitest/general/test_bug653364.html | 39 +++++++++++++++++++ .../mochitest/whatwg/test_bug500328.html | 1 + 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 dom/tests/mochitest/general/test_bug653364.html diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e2ba752a2cf3..0b27643b9d86 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -2620,7 +2620,7 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_BEGIN(HashChangeEvent, nsIDOMHashChangeEvent) DOM_CLASSINFO_MAP_ENTRY(nsIDOMHashChangeEvent) - DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES + DOM_CLASSINFO_EVENT_MAP_ENTRIES DOM_CLASSINFO_MAP_END if (nsDOMTouchEvent::PrefEnabled()) { diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in index 5fec6fa98313..bbd52c0f3f13 100644 --- a/dom/tests/mochitest/general/Makefile.in +++ b/dom/tests/mochitest/general/Makefile.in @@ -54,6 +54,7 @@ _TEST_FILES = \ test_bug628069_2.html \ file_bug628069.html \ test_bug631440.html \ + test_bug653364.html \ test_consoleAPI.html \ test_domWindowUtils.html \ test_domWindowUtils_scrollXY.html \ diff --git a/dom/tests/mochitest/general/test_bug628069_1.html b/dom/tests/mochitest/general/test_bug628069_1.html index 9f1b04b9838d..8ba4c6927a93 100644 --- a/dom/tests/mochitest/general/test_bug628069_1.html +++ b/dom/tests/mochitest/general/test_bug628069_1.html @@ -41,6 +41,7 @@ function childLoad() { function childHashchange(e) { is(e.oldURL, gOrigURL, 'event.oldURL'); is(e.newURL, gOrigURL + '#hash', 'event.newURL'); + is(e.isTrusted, true, 'Hashchange event should be trusted.'); popup.close(); SimpleTest.finish(); } diff --git a/dom/tests/mochitest/general/test_bug628069_2.html b/dom/tests/mochitest/general/test_bug628069_2.html index 9e6c82743b8f..89da0ed2b55d 100644 --- a/dom/tests/mochitest/general/test_bug628069_2.html +++ b/dom/tests/mochitest/general/test_bug628069_2.html @@ -27,6 +27,7 @@ document.addEventListener("hashChange", function(e) { gotHashChange = 1; is(e.oldURL, "oldURL"); is(e.newURL, "newURL"); + is(e.isTrusted, false, "Hashchange event shouldn't be trusted."); }, true); let hc = document.createEvent("HashChangeEvent"); diff --git a/dom/tests/mochitest/general/test_bug653364.html b/dom/tests/mochitest/general/test_bug653364.html new file mode 100644 index 000000000000..e10da384cbd2 --- /dev/null +++ b/dom/tests/mochitest/general/test_bug653364.html @@ -0,0 +1,39 @@ + + + + + Test for Bug 653364 + + + + + + +Mozilla Bug 653364 +

+
+ + +
+
+
+
+
diff --git a/dom/tests/mochitest/whatwg/test_bug500328.html b/dom/tests/mochitest/whatwg/test_bug500328.html
index 1f6a2f77bb87..95fdf5241dbc 100644
--- a/dom/tests/mochitest/whatwg/test_bug500328.html
+++ b/dom/tests/mochitest/whatwg/test_bug500328.html
@@ -274,6 +274,7 @@ function runTest() {
 
   statusMsg("Awake after going back to page 1.");
   popstateExpected("Going back to page 1 should trigger a popstate.");
+  is(gLastPopStateEvent.isTrusted, true, 'Popstate event should be trusted.');
   is(JSON.stringify(gLastPopStateEvent.state), JSON.stringify(testObj1),
      "Wrong state object popped after going back to page 1.");
   ok(gLastPopStateEvent.state === iframeCw.history.state,