webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 41 insertions, 47 deletions

diff --git a/Source/WebCore/html/HTMLObjectElement.h b/Source/WebCore/html/HTMLObjectElement.h
index 636f6d627..9ea893b01 100644
--- a/Source/WebCore/html/HTMLObjectElement.h
+++ b/Source/WebCore/html/HTMLObjectElement.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef HTMLObjectElement_h
-#define HTMLObjectElement_h
+#pragma once
 
 #include "FormAssociatedElement.h"
 #include "HTMLPlugInImageElement.h"
@@ -32,61 +31,54 @@ class HTMLFormElement;
 
 class HTMLObjectElement final : public HTMLPlugInImageElement, public FormAssociatedElement {
 public:
-    static PassRefPtr<HTMLObjectElement> create(const QualifiedName&, Document&, HTMLFormElement*, bool createdByParser);
+    static Ref<HTMLObjectElement> create(const QualifiedName&, Document&, HTMLFormElement*, bool createdByParser);
     virtual ~HTMLObjectElement();
 
     bool isDocNamedItem() const { return m_docNamedItem; }
-
-    const String& classId() const { return m_classId; }
-
     bool containsJavaApplet() const;
 
-    virtual bool useFallbackContent() const override { return m_useFallbackContent; }
+    bool hasFallbackContent() const;
+    bool useFallbackContent() const final { return m_useFallbackContent; }
     void renderFallbackContent();
 
-    // Implementations of FormAssociatedElement
-    HTMLFormElement* form() const { return FormAssociatedElement::form(); }
+    bool willValidate() const final { return false; }
 
-    virtual bool isFormControlElement() const override { return false; }
-
-    virtual bool isEnumeratable() const override { return true; }
-    virtual bool appendFormData(FormDataList&, bool) override;
-
-    // Implementations of constraint validation API.
+    // Implementation of constraint validation API.
     // Note that the object elements are always barred from constraint validation.
-    virtual String validationMessage() const override { return String(); }
-    bool checkValidity() { return true; }
-    virtual void setCustomValidity(const String&) override { }
+    static bool checkValidity() { return true; }
+    static bool reportValidity() { return true; }
 
-    using Node::ref;
-    using Node::deref;
+    void setCustomValidity(const String&) final { }
+    String validationMessage() const final { return String(); }
 
-    virtual bool canContainRangeEndPoint() const override { return useFallbackContent(); }
+    using HTMLPlugInImageElement::ref;
+    using HTMLPlugInImageElement::deref;
 
-    bool hasFallbackContent() const;
+    HTMLFormElement* form() const final { return FormAssociatedElement::form(); }
 
 private:
     HTMLObjectElement(const QualifiedName&, Document&, HTMLFormElement*, bool createdByParser);
 
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
-    virtual bool isPresentationAttribute(const QualifiedName&) const override;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
+    bool isPresentationAttribute(const QualifiedName&) const final;
+    void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final;
 
-    virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
-    virtual void removedFrom(ContainerNode&) override;
+    InsertionNotificationRequest insertedInto(ContainerNode&) final;
+    void finishedInsertingSubtree() final;
+    void removedFrom(ContainerNode&) final;
 
-    virtual void didMoveToNewDocument(Document* oldDocument) override;
+    void didMoveToNewDocument(Document& oldDocument) final;
 
-    virtual void childrenChanged(const ChildChange&) override;
+    void childrenChanged(const ChildChange&) final;
 
-    virtual bool isURLAttribute(const Attribute&) const override;
-    virtual const AtomicString& imageSourceURL() const override;
+    bool isURLAttribute(const Attribute&) const final;
+    const AtomicString& imageSourceURL() const final;
 
-    virtual RenderWidget* renderWidgetForJSBindings() const override;
+    RenderWidget* renderWidgetLoadingPlugin() const final;
 
-    virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
+    void addSubresourceAttributeURLs(ListHashSet<URL>&) const final;
 
-    virtual void updateWidget(PluginCreationOption) override;
+    void updateWidget(CreatePlugins) final;
     void updateDocNamedItem();
 
     // FIXME: This function should not deal with url or serviceType
@@ -95,22 +87,24 @@ private:
     
     bool shouldAllowQuickTimeClassIdQuirk();
     bool hasValidClassId();
+    void clearUseFallbackContent() { m_useFallbackContent = false; }
 
-    virtual void refFormAssociatedElement() override { ref(); }
-    virtual void derefFormAssociatedElement() override { deref(); }
-    virtual HTMLFormElement* virtualForm() const override;
+    void refFormAssociatedElement() final { ref(); }
+    void derefFormAssociatedElement() final { deref(); }
 
-    virtual FormNamedItem* asFormNamedItem() override final { return this; }
-    virtual HTMLObjectElement& asHTMLElement() override final { return *this; }
-    virtual const HTMLObjectElement& asHTMLElement() const override final { return *this; }
+    FormNamedItem* asFormNamedItem() final { return this; }
+    HTMLObjectElement& asHTMLElement() final { return *this; }
+    const HTMLObjectElement& asHTMLElement() const final { return *this; }
+
+    bool isFormControlElement() const final { return false; }
+
+    bool isEnumeratable() const final { return true; }
+    bool appendFormData(FormDataList&, bool) final;
+
+    bool canContainRangeEndPoint() const final;
 
-    String m_classId;
     bool m_docNamedItem : 1;
     bool m_useFallbackContent : 1;
 };
 
-NODE_TYPE_CASTS(HTMLObjectElement)
-
-}
-
-#endif
+} // namespace WebCore