Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLElement.h

diff --git a/src/third_party/WebKit/Source/core/html/HTMLElement.h b/src/third_party/WebKit/Source/core/html/HTMLElement.h
index 082ca21..7fa604f 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLElement.h
+++ b/src/third_party/WebKit/Source/core/html/HTMLElement.h
@@ -30,6 +30,7 @@ namespace blink {
 class DocumentFragment;
 class HTMLCollection;
 class HTMLFormElement;
+class HTMLMenuElement;
 class ExceptionState;
 
 enum TranslateAttributeMode {
@@ -39,6 +40,7 @@ enum TranslateAttributeMode {
 };
 
 class HTMLElement : public Element {
+    DEFINE_WRAPPERTYPEINFO();
 public:
     DECLARE_ELEMENT_FACTORY_WITH_TAGNAME(HTMLElement);
 
@@ -95,6 +97,9 @@ public:
 
     static const AtomicString& eventParameterName();
 
+    HTMLMenuElement* contextMenu() const;
+    void setContextMenu(HTMLMenuElement*);
+
 protected:
     HTMLElement(const QualifiedName& tagName, Document&, ConstructionType);
 
@@ -141,7 +146,6 @@ inline HTMLElement::HTMLElement(const QualifiedName& tagName, Document& document
     : Element(tagName, &document, type)
 {
     ASSERT(!tagName.localName().isNull());
-    ScriptWrappable::init(this);
 }
 
 inline bool Node::hasTagName(const HTMLQualifiedName& name) const