| Index: third_party/WebKit/Source/core/html/HTMLObjectElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.h b/third_party/WebKit/Source/core/html/HTMLObjectElement.h
|
| index c816f07d533d00e5a9eff77da3fa773450ecff31..fea5c46594473c6a7982fafad5c74048df212207 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLObjectElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.h
|
| @@ -24,19 +24,19 @@
|
| #define HTMLObjectElement_h
|
|
|
| #include "core/CoreExport.h"
|
| -#include "core/html/FormAssociatedElement.h"
|
| #include "core/html/HTMLPlugInElement.h"
|
| +#include "core/html/ListedElement.h"
|
|
|
| namespace blink {
|
|
|
| class HTMLFormElement;
|
|
|
| -// Inheritance of FormAssociatedElement was used for NPAPI form association, but
|
| +// Inheritance of ListedElement was used for NPAPI form association, but
|
| // is still kept here so that legacy APIs such as form attribute can keep
|
| // working according to the spec. See:
|
| // https://html.spec.whatwg.org/multipage/embedded-content.html#the-object-element
|
| class CORE_EXPORT HTMLObjectElement final : public HTMLPlugInElement,
|
| - public FormAssociatedElement {
|
| + public ListedElement {
|
| DEFINE_WRAPPERTYPEINFO();
|
| USING_GARBAGE_COLLECTED_MIXIN(HTMLObjectElement);
|
|
|
| @@ -127,19 +127,19 @@ class CORE_EXPORT HTMLObjectElement final : public HTMLPlugInElement,
|
| // Intentionally left unimplemented, template specialization needs to be
|
| // provided for specific return types.
|
| template <typename T>
|
| -inline const T& toElement(const FormAssociatedElement&);
|
| +inline const T& toElement(const ListedElement&);
|
| template <typename T>
|
| -inline const T* toElement(const FormAssociatedElement*);
|
| +inline const T* toElement(const ListedElement*);
|
|
|
| -// Make toHTMLObjectElement() accept a FormAssociatedElement as input instead of
|
| +// Make toHTMLObjectElement() accept a ListedElement as input instead of
|
| // a Node.
|
| template <>
|
| inline const HTMLObjectElement* toElement<HTMLObjectElement>(
|
| - const FormAssociatedElement* element) {
|
| + const ListedElement* element) {
|
| SECURITY_DCHECK(!element || !element->isFormControlElement());
|
| const HTMLObjectElement* objectElement =
|
| static_cast<const HTMLObjectElement*>(element);
|
| - // We need to assert after the cast because FormAssociatedElement doesn't
|
| + // We need to assert after the cast because ListedElement doesn't
|
| // have hasTagName.
|
| SECURITY_DCHECK(!objectElement ||
|
| objectElement->hasTagName(HTMLNames::objectTag));
|
| @@ -148,11 +148,11 @@ inline const HTMLObjectElement* toElement<HTMLObjectElement>(
|
|
|
| template <>
|
| inline const HTMLObjectElement& toElement<HTMLObjectElement>(
|
| - const FormAssociatedElement& element) {
|
| + const ListedElement& element) {
|
| SECURITY_DCHECK(!element.isFormControlElement());
|
| const HTMLObjectElement& objectElement =
|
| static_cast<const HTMLObjectElement&>(element);
|
| - // We need to assert after the cast because FormAssociatedElement doesn't
|
| + // We need to assert after the cast because ListedElement doesn't
|
| // have hasTagName.
|
| SECURITY_DCHECK(objectElement.hasTagName(HTMLNames::objectTag));
|
| return objectElement;
|
|
|