Closed Bug 1402102 Opened 7 years ago Closed 7 years ago

Remove nsIDOMHTMLObjectElement

Categories

(Core :: DOM: Core & HTML, enhancement)

enhancement
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla58
Tracking Status
firefox58 --- fixed

People

(Reporter: qdot, Assigned: qdot)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Continuing removal of XPCOM DOM HTML Element interfaces.
Assignee: nobody → kyle
Comment on attachment 8911002 [details]
Bug 1402102 - Remove nsIDOMHTMLObjectElement;

https://reviewboard.mozilla.org/r/182468/#review188048

Please file a bug on comm-central to remove the use of nsIDOMHTMLObjectElement in suite/browser/nsTypeAheadFind.js.

r=me with that and the nits below.  Thank you!

::: docshell/base/nsDocShellTreeOwner.cpp:1586
(Diff revision 1)
> -    }
> -
>      nsCOMPtr<nsIContent> content = do_QueryInterface(node);
> -    if (objectElement || (content && content->IsHTMLElement(nsGkAtoms::embed))) {
> +    if (content &&
> +        (content->IsHTMLElement(nsGkAtoms::embed) ||
> +         (!(flags & nsIContextMenuListener::CONTEXT_IMAGE) && content->IsHTMLElement(nsGkAtoms::object)))) {

This runs over 80 chars, I expect.

::: dom/base/nsObjectLoadingContent.cpp:894
(Diff revision 1)
>  
>      if (name.IsEmpty())
>        continue;
>  
>      nsCOMPtr<nsIContent> parent = element->GetParent();
> -    nsCOMPtr<nsIDOMHTMLObjectElement> domObject;
> +    RefPtr<HTMLObjectElement> domObject;

s/domObject/objectElement/, perhaps?

::: dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp:535
(Diff revision 1)
>  
>      if (content->IsHTMLElement(nsGkAtoms::embed)) {
>          return OnWalkAttribute(aNode, "src");
>      }
>  
> -    nsCOMPtr<nsIDOMHTMLObjectElement> nodeAsObject = do_QueryInterface(aNode);
> +    RefPtr<dom::HTMLObjectElement> nodeAsObject = dom::HTMLObjectElement::FromContent(content);

We don't actually use nodeAsObject, right?  So you could just make this an IsHTMLElement(nsGkAtoms::object) check and avoid the extra refcounting.

::: dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp:1069
(Diff revision 1)
>              FixupAttribute(*aNodeOut, "src");
>          }
>          return rv;
>      }
>  
> -    nsCOMPtr<nsIDOMHTMLObjectElement> nodeAsObject = do_QueryInterface(aNodeIn);
> +    RefPtr<dom::HTMLObjectElement> nodeAsObject = dom::HTMLObjectElement::FromContent(content);

Again, nodeAsObject is unused.
Attachment #8911002 - Flags: review?(bzbarsky) → review+
Pushed by kmachulis@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/d05d93a25235
Remove nsIDOMHTMLObjectElement; r=bz
https://hg.mozilla.org/mozilla-central/rev/d05d93a25235
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla58
Component: DOM → DOM: Core & HTML
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: