Changeset 21184

Timestamp:

04/29/07 13:32:51 (3 years ago)

Author:

darin

Message:

Reviewed by Adele.

• fix the Gmail part of  http://bugs.webkit.org/show_bug.cgi?id=12798 and < rdar://problem/4118559>

This patch changes things so that resizing can make things larger than their
initial size, but not smaller. I believe this resolves the problem for Gmail,
but you can still get strange behavior if you have a small right-aligned <textarea>.

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::resize): Rewrote to use more IntPoint and IntSize and add in a new minimum-size algorithm. This function now has the side effect of storing a new minimumSizeForResizing in the element being resized, and respects any existing minimum as well. (WebCore::RenderLayer::offsetFromResizeCorner): Reversed this so it converts the point into coordinates relative to the resize corner, hence negative numbers mean the point is above and to the left. This is used only in the algorithm above.

• dom/Element.h: Removed unneeded include of Attr.h, and added forward declarations as needed. Removed all friend declarations; there was no need for any of them. Tweaked formatting of various declarations and removed unneeded parameter names. Made as much as possible private, and a couple things public to avoid the need for friend classes. Added minimumSizeForResizing, setMinimumSizeForResizing, rareData, and createRareData functions.

• dom/Element.cpp: (WebCore::rareDataMap): Added. Function to return the single global map. (WebCore::rareDataFromMap): Added. For use by inlined functions to get the data from the map in the case where it's present. (WebCore::ElementRareData::ElementRareData): Added. (WebCore::Element::~Element): Added code to delete the element from the rare data map when appropriate. (WebCore::Element::rareData): Added. (WebCore::Element::createRareData): Added. (WebCore::Element::setAttributeNodeNS): Got rid of the old inline version of this, since it was the sole reason we had to include Attr.h in Element.h. (WebCore::Element::minimumSizeForResizing): Added. Accesses rare data. (WebCore::Element::setMinimumSizeForResizing): Ditto.

• dom/Node.h: Renamed the m_specified bit since it's now used for two purposes. Its new long name is m_attrWasSpecifiedOrElementHasRareData.

• dom/Attr.cpp: (WebCore::Attr::Attr): Updated for bit name change.
• dom/Attr.h: (WebCore::Attr::specified): Ditto. (WebCore::Attr::setSpecified): Added, since setting the bit directly is pretty ugly now.
• dom/Document.cpp: (WebCore::Document::adoptNode): Updated for bit name change.
• dom/Node.cpp: (WebCore::Node::Node): Ditto. (WebCore::Node::dump): Ditto.

• dom/NamedAttrMap.cpp: (WebCore::NamedAttrMap::isReadOnlyNode): Moved out of line, since this was the sole reason we had to include Element.h in NamedAttrMap.h.

• html/HTMLElement.cpp: (WebCore::HTMLElement::nodeName): Changed to use tagQName() since that's a public way to do something that's now private. (WebCore::HTMLElement::cloneNode): Ditto.

• dom/Attribute.cpp:
• dom/NamedAttrMap.h:
• dom/NamedMappedAttrMap.cpp:
• dom/StyledElement.h:
• html/HTMLTokenizer.h:
• xml/XPathFunctions.cpp:
• xml/XPathStep.cpp: Updated includes, and other administrivia.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Attr.cpp (modified) (2 diffs)
• dom/Attr.h (modified) (4 diffs)
• dom/Attribute.cpp (modified) (3 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (5 diffs)
• dom/Element.h (modified) (11 diffs)
• dom/NamedAttrMap.cpp (modified) (3 diffs)
• dom/NamedAttrMap.h (modified) (3 diffs)
• dom/NamedMappedAttrMap.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (4 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/StyledElement.h (modified) (3 diffs)
• html/HTMLElement.cpp (modified) (3 diffs)
• html/HTMLTokenizer.h (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (3 diffs)
• xml/XPathFunctions.cpp (modified) (1 diff)
• xml/XPathStep.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adele.
+
+        - fix the Gmail part of http://bugs.webkit.org/show_bug.cgi?id=12798
+          and <rdar://problem/4118559>
+
+        This patch changes things so that resizing can make things larger than their
+        initial size, but not smaller. I believe this resolves the problem for Gmail,
+        but you can still get strange behavior if you have a small right-aligned <textarea>.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::resize): Rewrote to use more IntPoint and IntSize and add
+        in a new minimum-size algorithm. This function now has the side effect of storing
+        a new minimumSizeForResizing in the element being resized, and respects any existing
+        minimum as well.
+        (WebCore::RenderLayer::offsetFromResizeCorner): Reversed this so it converts the
+        point into coordinates relative to the resize corner, hence negative numbers mean
+        the point is above and to the left. This is used only in the algorithm above.
+
+        * dom/Element.h: Removed unneeded include of Attr.h, and added forward declarations
+        as needed. Removed all friend declarations; there was no need for any of them.
+        Tweaked formatting of various declarations and removed unneeded parameter names.
+        Made as much as possible private, and a couple things public to avoid the need for
+        friend classes. Added minimumSizeForResizing, setMinimumSizeForResizing, rareData,
+        and createRareData functions.
+
+        * dom/Element.cpp:
+        (WebCore::rareDataMap): Added. Function to return the single global map.
+        (WebCore::rareDataFromMap): Added. For use by inlined functions to get the
+        data from the map in the case where it's present.
+        (WebCore::ElementRareData::ElementRareData): Added.
+        (WebCore::Element::~Element): Added code to delete the element from the rare
+        data map when appropriate.
+        (WebCore::Element::rareData): Added.
+        (WebCore::Element::createRareData): Added.
+        (WebCore::Element::setAttributeNodeNS): Got rid of the old inline version of this,
+        since it was the sole reason we had to include Attr.h in Element.h.
+        (WebCore::Element::minimumSizeForResizing): Added. Accesses rare data.
+        (WebCore::Element::setMinimumSizeForResizing): Ditto.
+
+        * dom/Node.h: Renamed the m_specified bit since it's now used for two purposes.
+        Its new long name is m_attrWasSpecifiedOrElementHasRareData.
+
+        * dom/Attr.cpp: (WebCore::Attr::Attr): Updated for bit name change.
+        * dom/Attr.h:
+        (WebCore::Attr::specified): Ditto.
+        (WebCore::Attr::setSpecified): Added, since setting the bit directly is pretty ugly now.
+        * dom/Document.cpp: (WebCore::Document::adoptNode): Updated for bit name change.
+        * dom/Node.cpp:
+        (WebCore::Node::Node): Ditto.
+        (WebCore::Node::dump): Ditto.
+
+        * dom/NamedAttrMap.cpp: (WebCore::NamedAttrMap::isReadOnlyNode): Moved out of line,
+        since this was the sole reason we had to include Element.h in NamedAttrMap.h.
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::nodeName): Changed to use tagQName() since that's a public
+        way to do something that's now private.
+        (WebCore::HTMLElement::cloneNode): Ditto.
+
+        * dom/Attribute.cpp:
+        * dom/NamedAttrMap.h:
+        * dom/NamedMappedAttrMap.cpp:
+        * dom/StyledElement.h:
+        * html/HTMLTokenizer.h:
+        * xml/XPathFunctions.cpp:
+        * xml/XPathStep.cpp:
+        Updated includes, and other administrivia.
+
 2007-04-29  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/dom/Attr.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -41 +39 @@
     ASSERT(!m_attribute->attr());
     m_attribute->m_impl = this;
-    m_specified = true;
+    m_attrWasSpecifiedOrElementHasRareData = true;
 }
 

trunk/WebCore/dom/Attr.h

@@ -1 +1 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -33 +31 @@
 namespace WebCore {
 
-
 // this has no counterpart in DOM, purely internal
 // representation of the nodevalue of an Attr.
@@ -59 +56 @@
     // DOM methods & attributes for Attr
     String name() const { return qualifiedName().toString(); }
-    bool specified() const { return m_specified; }
+    bool specified() const { return m_attrWasSpecifiedOrElementHasRareData; }
     Element* ownerElement() const { return m_element; }
 
@@ -90 +87 @@
     CSSStyleDeclaration* style() { return m_attribute->style(); }
 
+    void setSpecified(bool specified) { m_attrWasSpecifiedOrElementHasRareData = specified; }
+
 private:
     Element* m_element;

trunk/WebCore/dom/Attribute.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -27 +25 @@
 #include "Attribute.h"
 
+#include "Attr.h"
 #include "Element.h"
 
@@ -38 +37 @@
 PassRefPtr<Attr> Attribute::createAttrIfNeeded(Element* e)
 {
-    RefPtr<Attr> r(m_impl);
+    RefPtr<Attr> r = m_impl;
     if (!r) {
         r = new Attr(e, e->document(), this);

trunk/WebCore/dom/Document.cpp

@@ -637 +637 @@
             if (attr->ownerElement())
                 attr->ownerElement()->removeAttributeNode(attr, ec);
-            attr->m_specified = true;
+            attr->m_attrWasSpecifiedOrElementHasRareData = true;
             break;
         }       

trunk/WebCore/dom/Element.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -50 +48 @@
 using namespace XMLNames;
 
+class ElementRareData {
+public:
+    ElementRareData(Element*);
+    IntSize m_minimumSizeForResizing;
+};
+
+typedef HashMap<const Element*, ElementRareData*> ElementRareDataMap;
+
+static ElementRareDataMap& rareDataMap()
+{
+    static ElementRareDataMap* dataMap = new ElementRareDataMap;
+    return *dataMap;
+}
+
+static ElementRareData* rareDataFromMap(const Element* element)
+{
+    return rareDataMap().get(element);
+}
+
+static inline IntSize defaultMinimumSizeForResizing()
+{
+    return IntSize(INT_MAX, INT_MAX);
+}
+
+inline ElementRareData::ElementRareData(Element* element)
+    : m_minimumSizeForResizing(defaultMinimumSizeForResizing())
+{
+}
+
 Element::Element(const QualifiedName& qName, Document *doc)
     : ContainerNode(doc)
@@ -62 +89 @@
     if (namedAttrMap)
         namedAttrMap->detachFromElement();
+
+    if (!m_attrWasSpecifiedOrElementHasRareData)
+        ASSERT(!rareDataMap().contains(this));
+    else {
+        ElementRareDataMap& dataMap = rareDataMap();
+        ElementRareDataMap::iterator it = dataMap.find(this);
+        ASSERT(it != dataMap.end());
+        delete it->second;
+        dataMap.remove(it);
+    }
+}
+
+inline ElementRareData* Element::rareData()
+{
+    return m_attrWasSpecifiedOrElementHasRareData ? rareDataFromMap(this) : 0;
+}
+
+inline const ElementRareData* Element::rareData() const
+{
+    return m_attrWasSpecifiedOrElementHasRareData ? rareDataFromMap(this) : 0;
+}
+
+ElementRareData* Element::createRareData()
+{
+    if (m_attrWasSpecifiedOrElementHasRareData)
+        return rareDataMap().get(this);
+    ASSERT(!rareDataMap().contains(this));
+    ElementRareData* data = new ElementRareData(this);
+    rareDataMap().set(this, data);
+    m_attrWasSpecifiedOrElementHasRareData = true;
+    return data;
 }
 
@@ -816 +874 @@
 }
 
+PassRefPtr<Attr> Element::setAttributeNodeNS(Attr* attr, ExceptionCode& ec)
+{
+    ASSERT(attr);
+    return static_pointer_cast<Attr>(attributes(false)->setNamedItem(attr, ec));
+}
+
 PassRefPtr<Attr> Element::removeAttributeNode(Attr *attr, ExceptionCode& ec)
 {
@@ -986 +1050 @@
 }
 
-}
+IntSize Element::minimumSizeForResizing() const
+{
+    const ElementRareData* rd = rareData();
+    return rd ? rd->m_minimumSizeForResizing : defaultMinimumSizeForResizing();
+}
+
+void Element::setMinimumSizeForResizing(const IntSize& size)
+{
+    if (size == defaultMinimumSizeForResizing() && !rareData())
+        return;
+    createRareData()->m_minimumSizeForResizing = size;
+}
+
+}

trunk/WebCore/dom/Element.h

@@ -1 +1 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -28 +26 @@
 #define Element_h
 
-#include "Attr.h"
+#include "ContainerNode.h"
+#include "QualifiedName.h"
 #include "ScrollTypes.h"
 #include "Timer.h"
@@ -35 +34 @@
 
 class AtomicStringList;
+class Attr;
 class Attribute;
+class CSSStyleDeclaration;
+class ElementRareData;
+class IntSize;
 
 class Element : public ContainerNode {
-    friend class Document;
-    friend class NamedAttrMap;
-    friend class Attr;
-    friend class Node;
-    friend class CSSStyleSelector;
 public:
     Element(const QualifiedName&, Document*);
@@ -50 +48 @@
     virtual const AtomicStringList* getClassList() const;
     const AtomicString& getIDAttribute() const;
-    bool hasAttribute(const QualifiedName& name) const;
-    const AtomicString& getAttribute(const QualifiedName& name) const;
-    void setAttribute(const QualifiedName& name, StringImpl* value, ExceptionCode&);
-    void removeAttribute(const QualifiedName& name, ExceptionCode&);
+    bool hasAttribute(const QualifiedName&) const;
+    const AtomicString& getAttribute(const QualifiedName&) const;
+    void setAttribute(const QualifiedName&, StringImpl* value, ExceptionCode&);
+    void removeAttribute(const QualifiedName&, ExceptionCode&);
 
     bool hasAttributes() const;
@@ -89 +87 @@
     int scrollHeight();
 
-    void removeAttribute(const String &name, ExceptionCode& ec);
-    void removeAttributeNS(const String &namespaceURI, const String& localName, ExceptionCode&);
+    void removeAttribute(const String& name, ExceptionCode&);
+    void removeAttributeNS(const String& namespaceURI, const String& localName, ExceptionCode&);
 
     PassRefPtr<Attr> getAttributeNode(const String& name);
     PassRefPtr<Attr> getAttributeNodeNS(const String& namespaceURI, const String& localName);
     PassRefPtr<Attr> setAttributeNode(Attr*, ExceptionCode&);
-    PassRefPtr<Attr> setAttributeNodeNS(Attr* newAttr, ExceptionCode& ec) { return setAttributeNode(newAttr, ec); }
+    PassRefPtr<Attr> setAttributeNodeNS(Attr*, ExceptionCode&);
     PassRefPtr<Attr> removeAttributeNode(Attr*, ExceptionCode&);
     
-    virtual CSSStyleDeclaration *style();
+    virtual CSSStyleDeclaration* style();
 
     const QualifiedName& tagQName() const { return m_tagName; }
@@ -126 +124 @@
 
     // convenience methods which ignore exceptions
-    void setAttribute(const QualifiedName& name, const String& value);
-
-    virtual NamedAttrMap *attributes() const;
+    void setAttribute(const QualifiedName&, const String& value);
+
+    virtual NamedAttrMap* attributes() const;
     NamedAttrMap* attributes(bool readonly) const;
 
     // This method is called whenever an attribute is added, changed or removed.
-    virtual void attributeChanged(Attribute* attr, bool preserveDecls = false) {}
+    virtual void attributeChanged(Attribute*, bool preserveDecls = false) {}
 
     // not part of the DOM
     void setAttributeMap(NamedAttrMap*);
 
-    virtual void copyNonAttributeProperties(const Element *source) {}
+    virtual void copyNonAttributeProperties(const Element* source) {}
 
     virtual void attach();
     virtual void detach();
-    virtual RenderStyle *styleForRenderer(RenderObject *parent);
-    virtual RenderObject *createRenderer(RenderArena *, RenderStyle *);
-    virtual void recalcStyle( StyleChange = NoChange );
+    virtual RenderStyle* styleForRenderer(RenderObject* parent);
+    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+    virtual void recalcStyle(StyleChange = NoChange);
 
     virtual bool childTypeAllowed(NodeType);
@@ -149 +147 @@
     virtual Attribute* createAttribute(const QualifiedName& name, StringImpl* value);
     
-    void dispatchAttrRemovalEvent(Attribute *attr);
-    void dispatchAttrAdditionEvent(Attribute *attr);
+    void dispatchAttrRemovalEvent(Attribute*);
+    void dispatchAttrAdditionEvent(Attribute*);
 
     virtual void accessKeyAction(bool sendToAnyEvent) { }
@@ -156 +154 @@
     virtual String toString() const;
 
-    virtual bool isURLAttribute(Attribute *attr) const;
+    virtual bool isURLAttribute(Attribute*) const;
     virtual String target() const { return String(); }
         
@@ -164 +162 @@
     bool needsFocusAppearanceUpdate() const { return m_needsFocusAppearanceUpdate; }
     void setNeedsFocusAppearanceUpdate(bool b) { m_needsFocusAppearanceUpdate = b; }
-    
+
 #ifndef NDEBUG
-    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
-    virtual void formatForDebugger(char *buffer, unsigned length) const;
+    virtual void dump(TextStream* , DeprecatedString ind = "") const;
+    virtual void formatForDebugger(char* buffer, unsigned length) const;
 #endif
 
-    Node* insertAdjacentElement(const String& where, Node* newChild, int& exception);
+    Node* insertAdjacentElement(const String& where, Node* newChild, ExceptionCode&);
     bool contains(const Node*) const;
 
@@ -178 +176 @@
     virtual String title() const;
 
-protected:
+    String openTagStartToString() const;
+
+    void updateId(const AtomicString& oldId, const AtomicString& newId);
+
+    IntSize minimumSizeForResizing() const;
+    void setMinimumSizeForResizing(const IntSize&);
+
+private:
+    ElementRareData* rareData();
+    const ElementRareData* rareData() const;
+    ElementRareData* createRareData();
+
     virtual void createAttributeMap() const;
-    String openTagStartToString() const;
-
-private:
-    void updateId(const AtomicString& oldId, const AtomicString& newId);
 
     virtual void updateStyleAttributeIfNeeded() const {}
@@ -192 +197 @@
     bool m_needsFocusAppearanceUpdate;
 
-protected: // member variables
+protected:
     mutable RefPtr<NamedAttrMap> namedAttrMap;
+
+private:
     QualifiedName m_tagName;
 };

trunk/WebCore/dom/NamedAttrMap.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -23 +21 @@
  * Boston, MA 02111-1307, USA.
  */
+
 #include "config.h"
 #include "NamedAttrMap.h"
 
 #include "Document.h"
+#include "Element.h"
 #include "ExceptionCode.h"
 #include "HTMLNames.h"
@@ -359 +359 @@
 }
 
-}
+bool NamedAttrMap::isReadOnlyNode()
+{
+    return element && element->isReadOnlyNode();
+}
+
+}

trunk/WebCore/dom/NamedAttrMap.h

@@ -28 +28 @@
 #define NamedAttrMap_h
 
-#include "Element.h"
+#include "Attribute.h"
 #include "NamedNodeMap.h"
 
@@ -41 +41 @@
     friend class Element;
 public:
-    NamedAttrMap(Element *e);
+    NamedAttrMap(Element*);
     virtual ~NamedAttrMap();
     NamedAttrMap(const NamedAttrMap&);
@@ -65 +65 @@
     Attribute* getAttributeItem(const QualifiedName& name) const;
     Attribute* getAttributeItem(const String& name) const;
-    virtual bool isReadOnlyNode() { return element ? element->isReadOnlyNode() : false; }
+    virtual bool isReadOnlyNode();
 
     // used during parsing: only inserts if not already there

trunk/WebCore/dom/NamedMappedAttrMap.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -23 +21 @@
  * Boston, MA 02111-1307, USA.
  */
+
 #include "config.h"
 #include "NamedMappedAttrMap.h"
 
 #include "Document.h"
+#include "Element.h"
 
 namespace WebCore {

trunk/WebCore/dom/Node.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Trolltech ASA
  *
@@ -31 +29 @@
 #include "DOMImplementation.h"
 #include "Document.h"
+#include "Element.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
@@ -150 +149 @@
       m_inDocument(false),
       m_isLink(false),
-      m_specified(false),
+      m_attrWasSpecifiedOrElementHasRareData(false),
       m_focused(false),
       m_active(false),
@@ -798 +797 @@
     if (m_hasClass) { *stream << " hasClass"; }
     if (m_hasStyle) { *stream << " hasStyle"; }
-    if (m_specified) { *stream << " specified"; }
     if (m_focused) { *stream << " focused"; }
     if (m_active) { *stream << " active"; }

trunk/WebCore/dom/Node.h

@@ -1 +1 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -472 +470 @@
 
     bool m_isLink : 1;
-    bool m_specified : 1; // used in Attr; accessor functions there
+    bool m_attrWasSpecifiedOrElementHasRareData : 1; // used in Attr for one thing and Element for another
     bool m_focused : 1;
     bool m_active : 1;

trunk/WebCore/dom/StyledElement.h

@@ -1 +1 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -28 +26 @@
 #define StyledElement_h
 
+#include "Element.h"
 #include "NamedMappedAttrMap.h"
 
@@ -35 +34 @@
 class MappedAttribute;
 
-class StyledElement : public Element
-{
+class StyledElement : public Element {
 public:
     StyledElement(const QualifiedName&, Document*);

trunk/WebCore/html/HTMLElement.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
@@ -66 +64 @@
     // the string on a hit in the hash.
     if (document()->isHTMLDocument())
-        return m_tagName.localName().impl()->upper();
+        return tagQName().localName().impl()->upper();
     return Element::nodeName();
 }
@@ -94 +92 @@
 PassRefPtr<Node> HTMLElement::cloneNode(bool deep)
 {
-    RefPtr<HTMLElement> clone = HTMLElementFactory::createHTMLElement(m_tagName.localName(), document(), 0, false);
+    RefPtr<HTMLElement> clone = HTMLElementFactory::createHTMLElement(tagQName().localName(), document(), 0, false);
     if (!clone)
         return 0;

trunk/WebCore/html/HTMLTokenizer.h

@@ -1 +1 @@
 /*
-    This file is part of the KDE libraries
-
     Copyright (C) 1997 Martin Jones (mjones@kde.org)
               (C) 1997 Torben Weis (weis@kde.org)
@@ -115 +113 @@
     State parseProcessingInstruction(SegmentedString&, State);
     State scriptHandler(State);
-    State scriptExecution(const DeprecatedString& script, State state, DeprecatedString scriptURL = DeprecatedString(), int baseLine = 0);
+    State scriptExecution(const DeprecatedString& script, State, DeprecatedString scriptURL, int baseLine = 0);
     void setSrc(const SegmentedString&);
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
@@ -865 +865 @@
 }
 
-void RenderLayer::resize(const PlatformMouseEvent& evt, const IntSize& offsetFromResizeCorner)
-{
-    if (!inResizeMode() || !renderer()->hasOverflowClip() || m_object->style()->resize() == RESIZE_NONE)
-        return;
-
-    if (!m_object->document()->frame()->eventHandler()->mousePressed())
-        return;
-
-    // FIXME Radar 4118559: This behaves very oddly for textareas that are in blocks with right-aligned text; you have
-    // to drag the bottom-right corner to make the bottom-left corner move.
-    // FIXME Radar 4118564: ideally we'd autoscroll the window as necessary to keep the point under
-    // the cursor in view.
-
-    IntPoint currentPoint = m_object->document()->view()->windowToContents(evt.pos());
-    currentPoint += offsetFromResizeCorner;
-
-    int x;
-    int y;
-    m_object->absolutePosition(x, y);
-    int right = x + m_object->width();
-    int bottom = y + m_object->height();
-    int diffWidth =  max(currentPoint.x() - right, min(0, MinimumWidthWhileResizing - m_object->width()));
-    int diffHeight = max(currentPoint.y() - bottom, min(0, MinimumHeightWhileResizing - m_object->height()));
-    
-    ExceptionCode ec = 0;
-    // Set the width and height for the shadow ancestor node.  This is necessary for textareas since the resizable layer is on the inner div.
-    // For non-shadow content, this will set the width and height on the original node.
-    RenderObject* renderer = m_object->node()->shadowAncestorNode()->renderer();
-    if (diffWidth && (m_object->style()->resize() == RESIZE_HORIZONTAL || m_object->style()->resize() == RESIZE_BOTH)) {
-        CSSStyleDeclaration* style = static_cast<Element*>(m_object->node()->shadowAncestorNode())->style();
-        if (renderer->element() && renderer->element()->isControl()) {
+void RenderLayer::resize(const PlatformMouseEvent& evt, const IntSize& oldOffset)
+{
+    if (!inResizeMode() || !m_object->hasOverflowClip())
+        return;
+
+    // Set the width and height of the shadow ancestor node if there is one.
+    // This is necessary for textarea elements since the resizable layer is in the shadow content.
+    Element* element = static_cast<Element*>(m_object->node()->shadowAncestorNode());
+    RenderBox* renderer = static_cast<RenderBox*>(element->renderer());
+
+    EResize resize = renderer->style()->resize();
+    if (resize == RESIZE_NONE)
+        return;
+
+    Document* document = element->document();
+    if (!document->frame()->eventHandler()->mousePressed())
+        return;
+
+    IntSize newOffset = offsetFromResizeCorner(document->view()->windowToContents(evt.pos()));
+
+    IntSize currentSize = IntSize(renderer->width(), renderer->height());
+
+    IntSize minimumSize = element->minimumSizeForResizing().shrunkTo(currentSize);
+    element->setMinimumSizeForResizing(minimumSize);
+
+    IntSize difference = (currentSize + newOffset - oldOffset).expandedTo(minimumSize) - currentSize;
+
+    CSSStyleDeclaration* style = element->style();
+    bool isBoxSizingBorder = renderer->style()->boxSizing() == BORDER_BOX;
+
+    ExceptionCode ec;
+
+    if (difference.width()) {
+        if (element && element->isControl()) {
+            // Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
             style->setProperty(CSS_PROP_MARGIN_LEFT, String::number(renderer->marginLeft()) + "px", false, ec);
             style->setProperty(CSS_PROP_MARGIN_RIGHT, String::number(renderer->marginRight()) + "px", false, ec);
         }
-        int baseWidth = renderer->width() - (renderer->style()->boxSizing() == BORDER_BOX ? 0 : renderer->borderLeft() + renderer->paddingLeft() + renderer->borderRight() + renderer->paddingRight());
-        style->setProperty(CSS_PROP_WIDTH, String::number(baseWidth + diffWidth) + "px", false, ec);
-    }
-
-    if (diffHeight && (m_object->style()->resize() == RESIZE_VERTICAL || m_object->style()->resize() == RESIZE_BOTH)) {
-        CSSStyleDeclaration* style = static_cast<Element*>(m_object->node()->shadowAncestorNode())->style();
-        if (renderer->element() && renderer->element()->isControl()) {
+        int baseWidth = renderer->width() - (isBoxSizingBorder ? 0
+            : renderer->borderLeft() + renderer->paddingLeft() + renderer->borderRight() + renderer->paddingRight());
+        style->setProperty(CSS_PROP_WIDTH, String::number(baseWidth + difference.width()) + "px", false, ec);
+    }
+
+    if (difference.height()) {
+        if (element && element->isControl()) {
+            // Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
             style->setProperty(CSS_PROP_MARGIN_TOP, String::number(renderer->marginTop()) + "px", false, ec);
             style->setProperty(CSS_PROP_MARGIN_BOTTOM, String::number(renderer->marginBottom()) + "px", false, ec);
         }
-        int baseHeight = renderer->height() - (renderer->style()->boxSizing() == BORDER_BOX ? 0 : renderer->borderTop() + renderer->paddingTop() + renderer->borderBottom() + renderer->paddingBottom());
-        style->setProperty(CSS_PROP_HEIGHT, String::number(baseHeight + diffHeight) + "px", false, ec);
-    }
-    
-    ASSERT(ec == 0);
-
-    if (m_object->style()->resize() != RESIZE_NONE) {
-        m_object->setNeedsLayout(true);
-        m_object->node()->shadowAncestorNode()->renderer()->setNeedsLayout(true);
-        m_object->document()->updateLayout();
-    }
+        int baseHeight = renderer->height() - (isBoxSizingBorder ? 0
+            : renderer->borderTop() + renderer->paddingTop() + renderer->borderBottom() + renderer->paddingBottom());
+        style->setProperty(CSS_PROP_HEIGHT, String::number(baseHeight + difference.height()) + "px", false, ec);
+    }
+
+    document->updateLayout();
+
+    // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view.
 }
 
@@ -1044 +1046 @@
     int y = height();
     convertToLayerCoords(root(), x, y);
-    return IntSize(x - p.x(), y - p.y());
+    return p - IntPoint(x, y);
 }
 

trunk/WebCore/xml/XPathFunctions.cpp

@@ -32 +32 @@
 
 #include "Document.h"
+#include "Element.h"
 #include "NamedAttrMap.h"
 #include "XMLNames.h"

trunk/WebCore/xml/XPathStep.cpp

@@ -32 +32 @@
 
 #include "Document.h"
+#include "Element.h"
 #include "NamedAttrMap.h"
 #include "XPathNSResolver.h"