Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/WebCore/html/HTMLElement.h b/Source/WebCore/html/HTMLElement.h
index 2f6bc41..73517df 100644
--- a/Source/WebCore/html/HTMLElement.h
+++ b/Source/WebCore/html/HTMLElement.h
@@ -87,6 +87,8 @@ public:
     virtual void dispatchChangeEvents();
     virtual void dispatchInputEvents();
 
+    TextDirection directionalityIfhasDirAutoAttribute(bool& isAuto) const;
+
 protected:
     HTMLElement(const QualifiedName& tagName, Document*);
 
@@ -95,6 +97,8 @@ protected:
     virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
     virtual void parseMappedAttribute(Attribute*);
 
+    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
+
 private:
     virtual String nodeName() const;
 
@@ -106,6 +110,12 @@ private:
     PassRefPtr<DocumentFragment> textToFragment(const String&, ExceptionCode&);
 
     HTMLFormElement* shadowAncestorOwnerForm();
+
+    void dirAttributeChanged(Attribute*);
+    void adjustDirectionalityIfNeededAfterChildAttributeChanged(Element* child);
+    void calculateAndAdjustDirectionality();
+    void adjustDirectionalityIfNeededAfterChildrenChanged(Node* beforeChange, int childCountDelta);
+    TextDirection directionality(Node** strongDirectionalityTextNode= 0) const;
 };
 
 inline HTMLElement* toHTMLElement(Node* node)