diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/dom/Element.h | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/dom/Element.h')
-rw-r--r-- | Source/WebCore/dom/Element.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h index ba0870c..d269dbe 100644 --- a/Source/WebCore/dom/Element.h +++ b/Source/WebCore/dom/Element.h @@ -64,8 +64,6 @@ public: DEFINE_ATTRIBUTE_EVENT_LISTENER(dragstart); DEFINE_ATTRIBUTE_EVENT_LISTENER(drag); DEFINE_ATTRIBUTE_EVENT_LISTENER(dragend); - DEFINE_ATTRIBUTE_EVENT_LISTENER(formchange); - DEFINE_ATTRIBUTE_EVENT_LISTENER(forminput); DEFINE_ATTRIBUTE_EVENT_LISTENER(input); DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid); DEFINE_ATTRIBUTE_EVENT_LISTENER(keydown); @@ -231,8 +229,10 @@ public: virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); virtual void recalcStyle(StyleChange = NoChange); - Node* shadowRoot(); - void setShadowRoot(PassRefPtr<Node>); + ContainerNode* shadowRoot() const; + ContainerNode* ensureShadowRoot(); + void removeShadowRoot(); + virtual const AtomicString& shadowPseudoId() const; RenderStyle* computedStyle(PseudoId = NOPSEUDO); @@ -303,6 +303,10 @@ public: static bool isMathMLElement() { return false; } #endif +#if ENABLE(INPUT_SPEECH) + virtual bool isInputFieldSpeechButtonElement() const { return false; } +#endif + virtual bool isFormControlElement() const { return false; } virtual bool isEnabledFormControl() const { return true; } virtual bool isReadOnlyFormControl() const { return false; } @@ -364,13 +368,15 @@ protected: // They are separated to allow a different flow of control in StyledElement::attributeChanged(). void recalcStyleIfNeededAfterAttributeChanged(Attribute*); void updateAfterAttributeChanged(Attribute*); + + void idAttributeChanged(Attribute*); private: void scrollByUnits(int units, ScrollGranularity); virtual void setPrefix(const AtomicString&, ExceptionCode&); virtual NodeType nodeType() const; - virtual bool childTypeAllowed(NodeType); + virtual bool childTypeAllowed(NodeType) const; virtual PassRefPtr<Attribute> createAttribute(const QualifiedName&, const AtomicString& value); @@ -407,7 +413,6 @@ private: ElementRareData* ensureRareData(); SpellcheckAttributeState spellcheckAttributeState() const; - void removeShadowRoot(); private: mutable RefPtr<NamedNodeMap> m_attributeMap; |