From e65d66c52ed55ed19d07bafbc19aedc500cff5ea Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Mon, 31 Mar 2014 06:28:00 +0900 Subject: [PATCH] Bug 980134 - Hide DataContainerEvent from content. r=smaug --- content/base/public/nsDeprecatedOperationList.h | 1 + dom/events/DataContainerEvent.cpp | 6 ++++++ dom/events/test/chrome.ini | 1 + dom/events/test/test_bug368835.html | 6 +++--- dom/locales/en-US/chrome/dom/dom.properties | 2 ++ dom/tests/mochitest/general/test_interfaces.html | 2 -- dom/webidl/DataContainerEvent.webidl | 1 + webapprt/locales/en-US/webapprt/overrides/dom.properties | 2 ++ 8 files changed, 16 insertions(+), 5 deletions(-) diff --git a/content/base/public/nsDeprecatedOperationList.h b/content/base/public/nsDeprecatedOperationList.h index 088c9a3ee5a0..d26d0bcf8326 100644 --- a/content/base/public/nsDeprecatedOperationList.h +++ b/content/base/public/nsDeprecatedOperationList.h @@ -39,3 +39,4 @@ DEPRECATED_OPERATION(UseOfDOM3LoadMethod) DEPRECATED_OPERATION(ShowModalDialog) DEPRECATED_OPERATION(Window_Content) DEPRECATED_OPERATION(SyncXMLHttpRequest) +DEPRECATED_OPERATION(DataContainerEvent) diff --git a/dom/events/DataContainerEvent.cpp b/dom/events/DataContainerEvent.cpp index d089653b8dd1..fb25aa2edb18 100644 --- a/dom/events/DataContainerEvent.cpp +++ b/dom/events/DataContainerEvent.cpp @@ -5,6 +5,7 @@ #include "mozilla/dom/DataContainerEvent.h" #include "nsContentUtils.h" +#include "nsIDocument.h" #include "nsIXPConnect.h" namespace mozilla { @@ -15,6 +16,11 @@ DataContainerEvent::DataContainerEvent(EventTarget* aOwner, WidgetEvent* aEvent) : Event(aOwner, aPresContext, aEvent) { + if (mOwner) { + if (nsIDocument* doc = mOwner->GetExtantDoc()) { + doc->WarnOnceAbout(nsIDocument::eDataContainerEvent); + } + } } NS_IMPL_CYCLE_COLLECTION_CLASS(DataContainerEvent) diff --git a/dom/events/test/chrome.ini b/dom/events/test/chrome.ini index fd09c197e0de..db4d2ba32435 100644 --- a/dom/events/test/chrome.ini +++ b/dom/events/test/chrome.ini @@ -9,6 +9,7 @@ support-files = [test_bug336682.js] [test_bug336682_2.xul] +[test_bug368835.html] [test_bug415498.xul] [test_bug586961.xul] [test_bug591249.xul] diff --git a/dom/events/test/test_bug368835.html b/dom/events/test/test_bug368835.html index 5665dd788307..14581ee34cc9 100644 --- a/dom/events/test/test_bug368835.html +++ b/dom/events/test/test_bug368835.html @@ -6,9 +6,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=368835 Test for Bug 368835 - + - + @@ -89,11 +89,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=368835 document.body.addEventListener("dataContainerEvent", dataContainerEventHandler, true); document.body.dispatchEvent(event); + SimpleTest.finish(); } SimpleTest.waitForExplicitFinish(); addLoadEvent(doTest); - addLoadEvent(SimpleTest.finish); diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties index ff58e02cf7ff..7e4e9f74351a 100644 --- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -146,3 +146,5 @@ Window_ContentWarning=window._content is deprecated. Please use window.content # LOCALIZATION NOTE: Do not translate "XMLHttpRequest" SyncXMLHttpRequestWarning=Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help http://xhr.spec.whatwg.org/ ImplicitMetaViewportTagFallback=No meta-viewport tag found. Please explicitly specify one to prevent unexpected behavioural changes in future versions. For more help https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag +# LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent" +DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead. diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index aa3f999ee43c..959847d39fd5 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -255,8 +255,6 @@ var interfaceNamesInGlobalScope = "CustomEvent", // IMPORTANT: Do not change this list without review from a DOM peer! "DataChannel", -// IMPORTANT: Do not change this list without review from a DOM peer! - "DataContainerEvent", // IMPORTANT: Do not change this list without review from a DOM peer! {name: "DataErrorEvent", b2g: true, pref: "dom.mobileconnection.enabled"}, // IMPORTANT: Do not change this list without review from a DOM peer! diff --git a/dom/webidl/DataContainerEvent.webidl b/dom/webidl/DataContainerEvent.webidl index 8293063cfa7f..9684210409fa 100644 --- a/dom/webidl/DataContainerEvent.webidl +++ b/dom/webidl/DataContainerEvent.webidl @@ -6,6 +6,7 @@ interface nsIVariant; +[ChromeOnly] interface DataContainerEvent : Event { /** * Return the data associated with the given key. diff --git a/webapprt/locales/en-US/webapprt/overrides/dom.properties b/webapprt/locales/en-US/webapprt/overrides/dom.properties index ea7495c9f876..5d1c9bad958a 100644 --- a/webapprt/locales/en-US/webapprt/overrides/dom.properties +++ b/webapprt/locales/en-US/webapprt/overrides/dom.properties @@ -145,3 +145,5 @@ ShowModalDialogWarning=Use of window.showModalDialog() is deprecated. Use window Window_ContentWarning=window._content is deprecated. Please use window.content instead. # LOCALIZATION NOTE: Do not translate "XMLHttpRequest" SyncXMLHttpRequestWarning=Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help http://xhr.spec.whatwg.org/ +# LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent" +DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead.