diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 50593b54e7ef..c52f61abf8eb 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -416,11 +416,6 @@ nsObjectLoadingContent::OnDataAvailable(nsIRequest* aRequest, return NS_ERROR_UNEXPECTED; } -void nsObjectLoadingContent::PresetOpenerWindow( - const Nullable& aOpenerWindow, ErrorResult& aRv) { - aRv.Throw(NS_ERROR_FAILURE); -} - NS_IMETHODIMP nsObjectLoadingContent::GetActualType(nsACString& aType) { aType = mContentType; @@ -1821,22 +1816,6 @@ Document* nsObjectLoadingContent::GetContentDocument( return sub_doc; } -bool nsObjectLoadingContent::DoResolve( - JSContext* aCx, JS::Handle aObject, JS::Handle aId, - JS::MutableHandle> aDesc) { - return true; -} - -/* static */ -bool nsObjectLoadingContent::MayResolve(jsid aId) { - // We can resolve anything, really. - return true; -} - -void nsObjectLoadingContent::GetOwnPropertyNames( - JSContext* aCx, JS::MutableHandleVector /* unused */, - bool /* unused */, ErrorResult& aRv) {} - void nsObjectLoadingContent::MaybeFireErrorEvent() { Element* el = AsElement(); // Queue a task to fire an error event if we're an element. The diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h index 296e4a384668..03c7249fb60e 100644 --- a/dom/base/nsObjectLoadingContent.h +++ b/dom/base/nsObjectLoadingContent.h @@ -74,22 +74,8 @@ class nsObjectLoadingContent : public nsIStreamListener, } static bool IsFallbackMimeType(const nsACString& aMimeType); - - // Helper for WebIDL NeedResolve - bool DoResolve( - JSContext* aCx, JS::Handle aObject, JS::Handle aId, - JS::MutableHandle> aDesc); - // The return value is whether DoResolve might end up resolving the given - // id. If in doubt, return true. - static bool MayResolve(jsid aId); - static bool IsSuccessfulRequest(nsIRequest*, nsresult* aStatus); - // Helper for WebIDL enumeration - void GetOwnPropertyNames(JSContext* aCx, - JS::MutableHandleVector /* unused */, - bool /* unused */, mozilla::ErrorResult& aRv); - // WebIDL API mozilla::dom::Document* GetContentDocument(nsIPrincipal& aSubjectPrincipal); void GetActualType(nsAString& aType) const { @@ -113,10 +99,6 @@ class nsObjectLoadingContent : public nsIStreamListener, bool IsRewrittenYoutubeEmbed() const { return mRewrittenYoutubeEmbed; } - void PresetOpenerWindow(const mozilla::dom::Nullable< - mozilla::dom::WindowProxyHolder>& aOpenerWindow, - mozilla::ErrorResult& aRv); - const mozilla::Maybe& GetSubdocumentIntrinsicSize() const { return mSubdocumentIntrinsicSize; diff --git a/dom/webidl/HTMLEmbedElement.webidl b/dom/webidl/HTMLEmbedElement.webidl index be0694da3a32..e02484b1fbc7 100644 --- a/dom/webidl/HTMLEmbedElement.webidl +++ b/dom/webidl/HTMLEmbedElement.webidl @@ -13,8 +13,7 @@ */ // http://www.whatwg.org/specs/web-apps/current-work/#the-embed-element -[NeedResolve, - Exposed=Window] +[Exposed=Window] interface HTMLEmbedElement : HTMLElement { [HTMLConstructor] constructor(); diff --git a/dom/webidl/HTMLObjectElement.webidl b/dom/webidl/HTMLObjectElement.webidl index 559052a092bc..0e68de29b86d 100644 --- a/dom/webidl/HTMLObjectElement.webidl +++ b/dom/webidl/HTMLObjectElement.webidl @@ -13,8 +13,7 @@ */ // http://www.whatwg.org/specs/web-apps/current-work/#the-object-element -[NeedResolve, - Exposed=Window] +[Exposed=Window] interface HTMLObjectElement : HTMLElement { [HTMLConstructor] constructor();