Bug 865664 - Remove deprecated nsIDOMWindowUtils.getOuterWindowWithId. r?bz
MozReview-Commit-ID: By0a88Gu4p4
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -3082,33 +3082,16 @@ nsDOMWindowUtils::GetDisplayDPI(float *a
if (!widget)
return NS_ERROR_FAILURE;
*aDPI = widget->GetDPI();
return NS_OK;
}
-
-NS_IMETHODIMP
-nsDOMWindowUtils::GetOuterWindowWithId(uint64_t aWindowID,
- nsIDOMWindow** aWindow)
-{
- // XXX This method is deprecated. See bug 865664.
- nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
- NS_LITERAL_CSTRING("DOM"),
- nsContentUtils::GetDocumentFromCaller(),
- nsContentUtils::eDOM_PROPERTIES,
- "GetWindowWithOuterIdWarning");
-
- *aWindow = nsGlobalWindow::GetOuterWindowWithId(aWindowID);
- NS_IF_ADDREF(*aWindow);
- return NS_OK;
-}
-
NS_IMETHODIMP
nsDOMWindowUtils::GetContainerElement(nsIDOMElement** aResult)
{
nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryReferent(mWindow);
NS_ENSURE_STATE(window);
nsCOMPtr<nsIDOMElement> element =
do_QueryInterface(window->GetFrameElementInternal());
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -1483,22 +1483,16 @@ interface nsIDOMWindowUtils : nsISupport
[retval, array, size_is(frameCount)] out float frameIntervals);
/**
* The DPI of the display
*/
readonly attribute float displayDPI;
/**
- * Return the outer window with the given ID, if any. Can return null.
- * @deprecated Use nsIWindowMediator.getOuterWindowWithId. See bug 865664.
- */
- nsIDOMWindow getOuterWindowWithId(in unsigned long long aOuterWindowID);
-
- /**
* Return this window's frame element.
* Ignores all chrome/content or mozbrowser boundaries.
*/
readonly attribute nsIDOMElement containerElement;
[noscript] void RenderDocument(in nsConstRect aRect,
in uint32_t aFlags,
in nscolor aBackgroundColor,
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -157,18 +157,16 @@ PluginHangUITitle=Warning: Unresponsive
PluginHangUIMessage=%S may be busy, or it may have stopped responding. You can stop the plugin now, or you can continue to see if the plugin will complete.
PluginHangUIWaitButton=Continue
PluginHangUIStopButton=Stop plugin
PrefixedFullscreenAPIWarning=Prefixed Fullscreen API is deprecated. Please use unprefixed API for fullscreen. For more help https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API
# LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
NodeIteratorDetachWarning=Calling detach() on a NodeIterator no longer has an effect.
# LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
LenientThisWarning=Ignoring get or set of property that has [LenientThis] because the “this” object is incorrect.
-# LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
-GetWindowWithOuterIdWarning=Use of nsIDOMWindowUtils.getOuterWindowWithId() is deprecated. Instead, use the nsIWindowMediator method of the same name.
# LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
GetPreventDefaultWarning=Use of getPreventDefault() is deprecated. Use defaultPrevented instead.
# LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
GetSetUserDataWarning=Use of getUserData() or setUserData() is deprecated. Use WeakMap or element.dataset instead.
# LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
MozGetAsFileWarning=The non-standard mozGetAsFile method is deprecated and will soon be removed. Use the standard toBlob method instead.
# LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
UseOfCaptureEventsWarning=Use of captureEvents() is deprecated. To upgrade your code, use the DOM 2 addEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.addEventListener