Bug 1398445 - Remove window._content. r=mystor,qdot

MozReview-Commit-ID: 13KovslzGnM

--HG--
extra : rebase_source : 801700a3dc0b1ca207e3b47e9f6433fbd2d00505

dom/base/nsDeprecatedOperationList.h

@@ -34,7 +34,6 @@ DEPRECATED_OPERATION(UseOfReleaseEvents)
 DEPRECATED_OPERATION(UseOfDOM3LoadMethod)
 DEPRECATED_OPERATION(ChromeUseOfDOM3LoadMethod)
 DEPRECATED_OPERATION(ShowModalDialog)
-DEPRECATED_OPERATION(Window_Content)
 DEPRECATED_OPERATION(SyncXMLHttpRequest)
 DEPRECATED_OPERATION(Window_Cc_ontrollers)
 DEPRECATED_OPERATION(ImportXULIntoContent)

dom/base/nsGlobalWindow.h

@@ -1234,17 +1234,6 @@ public:
     return win.forget();
   }
 
-  void Get_content(JSContext* aCx,
-                   JS::MutableHandle<JSObject*> aRetval,
-                   mozilla::dom::SystemCallerGuarantee aCallerType,
-                   mozilla::ErrorResult& aError)
-  {
-    if (mDoc) {
-      mDoc->WarnOnceAbout(nsIDocument::eWindow_Content);
-    }
-    GetContent(aCx, aRetval, aCallerType, aError);
-  }
-
   already_AddRefed<mozilla::dom::Promise>
   CreateImageBitmap(JSContext* aCx,
                     const mozilla::dom::ImageBitmapSource& aImage,

dom/locales/en-US/chrome/dom/dom.properties

@@ -181,8 +181,6 @@ UseOfReleaseEventsWarning=Use of releaseEvents() is deprecated. To upgrade your
 UseOfDOM3LoadMethodWarning=Use of document.load() is deprecated. To upgrade your code, use the DOM XMLHttpRequest object. For more help https://developer.mozilla.org/en/XMLHttpRequest
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()"
 ShowModalDialogWarning=Use of window.showModalDialog() is deprecated. Use window.open() instead. For more help https://developer.mozilla.org/en-US/docs/Web/API/Window.open
-# LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
-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/
 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

dom/tests/browser/browser.ini

@@ -55,7 +55,6 @@ skip-if = !e10s || (os == "win" && processor == "x86") # Large-Allocation requir
 [browser_localStorage_e10s.js]
 skip-if = !e10s # This is a test of e10s functionality.
 [browser_localStorage_privatestorageevent.js]
-[browser_test__content.js]
 [browser_test_focus_after_modal_state.js]
 support-files =
   focus_after_prompt.html

dom/tests/browser/browser_test__content.js

@@ -1,4 +0,0 @@
-function test() {
-    is(window._content, window.content,
-       "_content needs to work, since extensions use it");
-}

dom/webidl/Window.webidl

@@ -338,8 +338,6 @@ partial interface Window {
 
   [ChromeOnly, Replaceable, Throws, NeedsCallerType] readonly attribute object? content;
 
-  [ChromeOnly, Throws, NeedsCallerType] readonly attribute object? __content;
-
   [Throws, ChromeOnly] any getInterface(IID iid);
 
   /**

toolkit/components/addoncompat/RemoteAddonsParent.jsm

@@ -1017,10 +1017,7 @@ TabBrowserElementInterposition.methods.removeTabsProgressListener = function(add
 var ChromeWindowInterposition = new Interposition("ChromeWindowInterposition",
                                                   EventTargetInterposition);
 
-// _content is for older add-ons like pinboard and all-in-one gestures
-// that should be using content instead.
-ChromeWindowInterposition.getters.content =
-ChromeWindowInterposition.getters._content = function(addon, target) {
+ChromeWindowInterposition.getters.content = function(addon, target) {
   CompatWarning.warn("Direct access to chromeWindow.content will no longer work in the chrome process.",
                      addon, CompatWarning.warnings.content);