AI 145796: Land the WebKit merge @r42026.

Automated import of CL 145796

1 files changed, 11 insertions, 4 deletions

diff --git a/WebCore/dom/Element.h b/WebCore/dom/Element.h
index e9bab28..b9b391a 100644
--- a/WebCore/dom/Element.h
+++ b/WebCore/dom/Element.h
@@ -36,6 +36,8 @@ class Attribute;
 class CSSStyleDeclaration;
 class ElementRareData;
 class IntSize;
+class ClientRect;
+class ClientRectList;
 
 class Element : public ContainerNode {
 public:
@@ -82,6 +84,9 @@ public:
     int scrollWidth();
     int scrollHeight();
 
+    PassRefPtr<ClientRectList> getClientRects() const;
+    PassRefPtr<ClientRect> getBoundingClientRect() const;
+
     void removeAttribute(const String& name, ExceptionCode&);
     void removeAttributeNS(const String& namespaceURI, const String& localName, ExceptionCode&);
 
@@ -110,20 +115,18 @@ public:
 
     // DOM methods overridden from parent classes
     virtual NodeType nodeType() const;
-    virtual PassRefPtr<Node> cloneNode(bool deep);
     virtual String nodeName() const;
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
-    PassRefPtr<Element> cloneElement();
+    PassRefPtr<Element> cloneElementWithChildren();
+    PassRefPtr<Element> cloneElementWithoutChildren();
 
     void normalizeAttributes();
 
     virtual bool isFormControlElement() const { return false; }
     virtual bool isFormControlElementWithState() const { return false; }
-    virtual bool isInputTypeHidden() const { return false; }
-    virtual bool isPasswordField() const { return false; }
 
     String nodeNamePreservingCase() const;
 
@@ -215,6 +218,10 @@ private:
     virtual const AtomicString& virtualLocalName() const { return localName(); }
     virtual const AtomicString& virtualNamespaceURI() const { return namespaceURI(); }
     
+    // cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
+    // are used instead.
+    virtual PassRefPtr<Node> cloneNode(bool deep);
+
     QualifiedName m_tagName;
     virtual NodeRareData* createRareData();