Rubber stamped by Eric.
- moved khtml/html files all into html directory
* WebCore.vcproj/WebCore/WebCore.vcproj: Updated for new paths.
* WebCore.vcproj/WebCore/build-generated-files.sh: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* khtml/html: Removed.
* html/DocTypeStrings.gperf: Moved.
* html/FormDataList.cpp: Ditto.
* html/FormDataList.h: Ditto.
* html/HTMLBaseFontElement.cpp: Ditto.
* html/HTMLBaseFontElement.h: Ditto.
* html/HTMLButtonElement.cpp: Ditto.
* html/HTMLButtonElement.h: Ditto.
* html/HTMLCanvasElement.cpp: Ditto.
* html/HTMLCanvasElement.h: Ditto.
* html/HTMLCollection.cpp: Ditto.
* html/HTMLCollection.h: Ditto.
* html/HTMLDocument.cpp: Ditto.
* html/HTMLDocument.h: Ditto.
* html/HTMLElement.cpp: Ditto.
* html/HTMLElement.h: Ditto.
* html/HTMLElementFactory.cpp: Ditto.
* html/HTMLElementFactory.h: Ditto.
* html/HTMLEntityNames.gperf: Ditto.
* html/HTMLFieldSetElement.cpp: Ditto.
* html/HTMLFieldSetElement.h: Ditto.
* html/HTMLFormCollection.cpp: Ditto.
* html/HTMLFormCollection.h: Ditto.
* html/HTMLFormElement.cpp: Ditto.
* html/HTMLFormElement.h: Ditto.
* html/HTMLGenericFormElement.cpp: Ditto.
* html/HTMLGenericFormElement.h: Ditto.
* html/HTMLInputElement.cpp: Ditto.
* html/HTMLInputElement.h: Ditto.
* html/HTMLIsIndexElement.cpp: Ditto.
* html/HTMLIsIndexElement.h: Ditto.
* html/HTMLKeygenElement.cpp: Ditto.
* html/HTMLKeygenElement.h: Ditto.
* html/HTMLLabelElement.cpp: Ditto.
* html/HTMLLabelElement.h: Ditto.
* html/HTMLLegendElement.cpp: Ditto.
* html/HTMLLegendElement.h: Ditto.
* html/HTMLNameCollection.cpp: Ditto.
* html/HTMLNameCollection.h: Ditto.
* html/HTMLNames.cpp: Ditto.
* html/HTMLNames.h: Ditto.
* html/HTMLOptGroupElement.cpp: Ditto.
* html/HTMLOptGroupElement.h: Ditto.
* html/HTMLOptionElement.cpp: Ditto.
* html/HTMLOptionElement.h: Ditto.
* html/HTMLOptionsCollection.cpp: Ditto.
* html/HTMLOptionsCollection.h: Ditto.
* html/HTMLParser.cpp: Ditto.
* html/HTMLParser.h: Ditto.
* html/HTMLSelectElement.cpp: Ditto.
* html/HTMLSelectElement.h: Ditto.
* html/HTMLTextAreaElement.cpp: Ditto.
* html/HTMLTextAreaElement.h: Ditto.
* html/HTMLTextFieldInnerElement.cpp: Ditto.
* html/HTMLTextFieldInnerElement.h: Ditto.
* html/HTMLTokenizer.cpp: Ditto.
* html/HTMLTokenizer.h: Ditto.
* html/html_baseimpl.cpp: Ditto.
* html/html_baseimpl.h: Ditto.
* html/html_blockimpl.cpp: Ditto.
* html/html_blockimpl.h: Ditto.
* html/html_headimpl.cpp: Ditto.
* html/html_headimpl.h: Ditto.
* html/html_imageimpl.cpp: Ditto.
* html/html_imageimpl.h: Ditto.
* html/html_inlineimpl.cpp: Ditto.
* html/html_inlineimpl.h: Ditto.
* html/html_listimpl.cpp: Ditto.
* html/html_listimpl.h: Ditto.
* html/html_objectimpl.cpp: Ditto.
* html/html_objectimpl.h: Ditto.
* html/html_tableimpl.cpp: Ditto.
* html/html_tableimpl.h: Ditto.
* bindings/objc/DOM.mm:
* bridge/mac/WebCoreEncodings.mm:
* bridge/mac/WebCoreFrameBridge.mm:
* css/CSSGrammar.y:
* css/cssstyleselector.cpp:
* dom/Document.cpp:
* dom/EventTargetNode.cpp:
* dom/NameNodeList.cpp:
* dom/Node.cpp:
* dom/Position.cpp:
* dom/dom_elementimpl.cpp:
* dom/xml_tokenizer.cpp:
* editing/ApplyStyleCommand.cpp:
* editing/BreakBlockquoteCommand.cpp:
* editing/CompositeEditCommand.cpp:
* editing/DeleteSelectionCommand.cpp:
* editing/InsertLineBreakCommand.cpp:
* editing/InsertParagraphSeparatorCommand.cpp:
* editing/JSEditor.cpp:
* editing/ReplaceSelectionCommand.cpp:
* editing/TextIterator.cpp:
* editing/VisiblePosition.cpp:
* editing/htmlediting.cpp:
* editing/markup.cpp:
* editing/visible_units.cpp:
* html/CanvasRenderingContext2D.cpp:
* kcanvas/KCanvasTreeDebug.cpp:
* khtml/ecma/JSDOMParser.cpp:
* khtml/ecma/kjs_css.cpp:
* khtml/ecma/kjs_dom.cpp:
* khtml/ecma/kjs_events.cpp:
* khtml/misc/decoder.cpp:
* khtml/xsl/XSLStyleSheet.cpp:
* khtml/xsl/XSLTProcessor.cpp:
* ksvg2/misc/SVGImageLoader.h:
* ksvg2/svg/SVGElement.cpp:
* ksvg2/svg/SVGSVGElement.cpp:
* kwq/WebCoreAXObject.mm:
* page/Frame.cpp:
* page/FrameView.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderBox.cpp:
* rendering/RenderFlow.cpp:
* rendering/RenderHTMLCanvas.cpp:
* rendering/RenderImage.cpp:
* rendering/RenderLayer.cpp:
* rendering/RenderObject.cpp:
* rendering/RenderTable.cpp:
* rendering/RenderTableCell.cpp:
* rendering/RenderTableCol.cpp:
* rendering/RenderTableRow.cpp:
* rendering/RenderTableSection.cpp:
* rendering/RenderTextField.cpp:
* rendering/RenderTheme.cpp:
* rendering/render_applet.cpp:
* rendering/render_button.cpp:
* rendering/render_frames.cpp:
* rendering/render_list.cpp:
Updated includes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13397 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/html/HTMLCollection.cpp b/WebCore/html/HTMLCollection.cpp
new file mode 100644
index 0000000..695c34e
--- /dev/null
+++ b/WebCore/html/HTMLCollection.cpp
@@ -0,0 +1,411 @@
+/**
+ * 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)
+ * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLCollection.h"
+#include "HTMLDocument.h"
+#include "HTMLElement.h"
+#include <kxmlcore/Vector.h>
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLCollection::HTMLCollection(Node *_base, int _type)
+ : m_base(_base),
+ type(_type),
+ info(0),
+ idsDone(false),
+ m_ownsInfo(false)
+{
+ if (_base->isDocumentNode() && _base->getDocument()->isHTMLDocument())
+ info = static_cast<HTMLDocument*>(_base->getDocument())->collectionInfo(type);
+}
+
+HTMLCollection::~HTMLCollection()
+{
+ if (m_ownsInfo)
+ delete info;
+}
+
+HTMLCollection::CollectionInfo::CollectionInfo() :
+ version(0)
+{
+ reset();
+}
+
+HTMLCollection::CollectionInfo::~CollectionInfo()
+{
+ deleteAllValues(idCache);
+ deleteAllValues(nameCache);
+}
+
+void HTMLCollection::CollectionInfo::reset()
+{
+ current = 0;
+ position = 0;
+ length = 0;
+ haslength = false;
+ elementsArrayPosition = 0;
+ deleteAllValues(idCache);
+ idCache.clear();
+ deleteAllValues(nameCache);
+ nameCache.clear();
+ hasNameCache = false;
+}
+
+void HTMLCollection::resetCollectionInfo() const
+{
+ unsigned int docversion = static_cast<HTMLDocument*>(m_base->getDocument())->domTreeVersion();
+
+ if (!info) {
+ info = new CollectionInfo;
+ m_ownsInfo = true;
+ info->version = docversion;
+ return;
+ }
+
+ if (info->version != docversion) {
+ info->reset();
+ info->version = docversion;
+ }
+}
+
+
+Node *HTMLCollection::traverseNextItem(Node *current) const
+{
+ assert(current);
+
+ if (type == NODE_CHILDREN && m_base.get() != current)
+ current = current->nextSibling();
+ else
+ current = current->traverseNextNode(m_base.get());
+
+ while (current) {
+ if (current->isElementNode()) {
+ bool found = false;
+ bool deep = true;
+ HTMLElement *e = static_cast<HTMLElement *>(current);
+ switch(type) {
+ case DOC_IMAGES:
+ if (e->hasLocalName(imgTag))
+ found = true;
+ break;
+ case DOC_FORMS:
+ if(e->hasLocalName(formTag))
+ found = true;
+ break;
+ case TABLE_TBODIES:
+ if (e->hasLocalName(tbodyTag))
+ found = true;
+ else if (e->hasLocalName(tableTag))
+ deep = false;
+ break;
+ case TR_CELLS:
+ if (e->hasLocalName(tdTag) || e->hasLocalName(thTag))
+ found = true;
+ else if (e->hasLocalName(tableTag))
+ deep = false;
+ break;
+ case TABLE_ROWS:
+ case TSECTION_ROWS:
+ if (e->hasLocalName(trTag))
+ found = true;
+ else if (e->hasLocalName(tableTag))
+ deep = false;
+ break;
+ case SELECT_OPTIONS:
+ if (e->hasLocalName(optionTag))
+ found = true;
+ break;
+ case MAP_AREAS:
+ if (e->hasLocalName(areaTag))
+ found = true;
+ break;
+ case DOC_APPLETS: // all OBJECT and APPLET elements
+ if (e->hasLocalName(objectTag) || e->hasLocalName(appletTag))
+ found = true;
+ break;
+ case DOC_EMBEDS: // all EMBED elements
+ if (e->hasLocalName(embedTag))
+ found = true;
+ break;
+ case DOC_OBJECTS: // all OBJECT elements
+ if (e->hasLocalName(objectTag))
+ found = true;
+ break;
+ case DOC_LINKS: // all A _and_ AREA elements with a value for href
+ if (e->hasLocalName(aTag) || e->hasLocalName(areaTag))
+ if (!e->getAttribute(hrefAttr).isNull())
+ found = true;
+ break;
+ case DOC_ANCHORS: // all A elements with a value for name or an id attribute
+ if (e->hasLocalName(aTag))
+ if (!e->getAttribute(nameAttr).isNull())
+ found = true;
+ break;
+ case DOC_ALL:
+ found = true;
+ break;
+ case NODE_CHILDREN:
+ found = true;
+ deep = false;
+ break;
+ default:
+ break;
+ }
+
+ if (found)
+ return current;
+ if (deep) {
+ current = current->traverseNextNode(m_base.get());
+ continue;
+ }
+ }
+ current = current->traverseNextSibling(m_base.get());
+ }
+ return 0;
+}
+
+
+unsigned HTMLCollection::calcLength() const
+{
+ unsigned len = 0;
+
+ for (Node *current = traverseNextItem(m_base.get()); current; current = traverseNextItem(current)) {
+ len++;
+ }
+
+ return len;
+}
+
+// since the collections are to be "live", we have to do the
+// calculation every time if anything has changed
+unsigned HTMLCollection::length() const
+{
+ resetCollectionInfo();
+ if (!info->haslength) {
+ info->length = calcLength();
+ info->haslength = true;
+ }
+ return info->length;
+}
+
+Node *HTMLCollection::item( unsigned index ) const
+{
+ resetCollectionInfo();
+ if (info->current && info->position == index) {
+ return info->current;
+ }
+ if (info->haslength && info->length <= index) {
+ return 0;
+ }
+ if (!info->current || info->position > index) {
+ info->current = traverseNextItem(m_base.get());
+ info->position = 0;
+ if (!info->current)
+ return 0;
+ }
+ Node *node = info->current;
+ for (unsigned pos = info->position; node && pos < index; pos++) {
+ node = traverseNextItem(node);
+ }
+ info->current = node;
+ info->position = index;
+ return info->current;
+}
+
+Node *HTMLCollection::firstItem() const
+{
+ return item(0);
+}
+
+Node *HTMLCollection::nextItem() const
+{
+ resetCollectionInfo();
+
+ // Look for the 'second' item. The first one is currentItem, already given back.
+ Node *retval = traverseNextItem(info->current);
+ info->current = retval;
+ info->position++;
+ return retval;
+}
+
+bool HTMLCollection::checkForNameMatch(Node *node, bool checkName, const String &name, bool caseSensitive) const
+{
+ if (!node->isHTMLElement())
+ return false;
+
+ HTMLElement *e = static_cast<HTMLElement*>(node);
+ if (caseSensitive) {
+ if (checkName) {
+ // document.all returns only images, forms, applets, objects and embeds
+ // by name (though everything by id)
+ if (type == DOC_ALL &&
+ !(e->hasLocalName(imgTag) || e->hasLocalName(formTag) ||
+ e->hasLocalName(appletTag) || e->hasLocalName(objectTag) ||
+ e->hasLocalName(embedTag)))
+ return false;
+
+ return e->getAttribute(nameAttr) == name && e->getAttribute(idAttr) != name;
+ } else
+ return e->getAttribute(idAttr) == name;
+ } else {
+ if (checkName) {
+ // document.all returns only images, forms, applets, objects and embeds
+ // by name (though everything by id)
+ if (type == DOC_ALL &&
+ !(e->hasLocalName(imgTag) || e->hasLocalName(formTag) ||
+ e->hasLocalName(appletTag) || e->hasLocalName(objectTag) ||
+ e->hasLocalName(embedTag)))
+ return false;
+
+ return e->getAttribute(nameAttr).domString().lower() == name.lower() &&
+ e->getAttribute(idAttr).domString().lower() != name.lower();
+ } else {
+ return e->getAttribute(idAttr).domString().lower() == name.lower();
+ }
+ }
+}
+
+
+Node *HTMLCollection::namedItem(const String &name, bool caseSensitive) const
+{
+ // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
+ // This method first searches for an object with a matching id
+ // attribute. If a match is not found, the method then searches for an
+ // object with a matching name attribute, but only on those elements
+ // that are allowed a name attribute.
+ resetCollectionInfo();
+ idsDone = false;
+
+ Node *n;
+ for (n = traverseNextItem(m_base.get()); n; n = traverseNextItem(n)) {
+ if (checkForNameMatch(n, idsDone, name, caseSensitive))
+ break;
+ }
+
+ info->current = n;
+ if(info->current)
+ return info->current;
+ idsDone = true;
+
+ for (n = traverseNextItem(m_base.get()); n; n = traverseNextItem(n)) {
+ if (checkForNameMatch(n, idsDone, name, caseSensitive))
+ break;
+ }
+
+ info->current = n;
+ return info->current;
+}
+
+void HTMLCollection::updateNameCache() const
+{
+ if (info->hasNameCache)
+ return;
+
+ for (Node *n = traverseNextItem(m_base.get()); n; n = traverseNextItem(n)) {
+ if (!n->isHTMLElement())
+ continue;
+ HTMLElement* e = static_cast<HTMLElement*>(n);
+ const AtomicString& idAttrVal = e->getAttribute(idAttr);
+ const AtomicString& nameAttrVal = e->getAttribute(nameAttr);
+ if (!idAttrVal.isEmpty()) {
+ // add to id cache
+ Vector<Node*>* idVector = info->idCache.get(idAttrVal.impl());
+ if (!idVector) {
+ idVector = new Vector<Node*>;
+ info->idCache.add(idAttrVal.impl(), idVector);
+ }
+ idVector->append(n);
+ }
+ if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal
+ && (type != DOC_ALL ||
+ (e->hasLocalName(imgTag) || e->hasLocalName(formTag) ||
+ e->hasLocalName(appletTag) || e->hasLocalName(objectTag) ||
+ e->hasLocalName(embedTag)))) {
+ // add to name cache
+ Vector<Node*>* nameVector = info->nameCache.get(nameAttrVal.impl());
+ if (!nameVector) {
+ nameVector = new Vector<Node*>;
+ info->nameCache.add(nameAttrVal.impl(), nameVector);
+ }
+ nameVector->append(n);
+ }
+ }
+
+ info->hasNameCache = true;
+}
+
+DeprecatedValueList< RefPtr<Node> > HTMLCollection::namedItems(const AtomicString &name) const
+{
+ DeprecatedValueList< RefPtr<Node> > result;
+
+ if (name.isEmpty())
+ return result;
+
+ resetCollectionInfo();
+ updateNameCache();
+
+ Vector<Node*>* idResults = info->idCache.get(name.impl());
+ Vector<Node*>* nameResults = info->nameCache.get(name.impl());
+
+ for (unsigned i = 0; idResults && i < idResults->size(); ++i)
+ result.append(RefPtr<Node>(idResults->at(i)));
+
+ for (unsigned i = 0; nameResults && i < nameResults->size(); ++i)
+ result.append(RefPtr<Node>(nameResults->at(i)));
+
+ return result;
+}
+
+
+Node *HTMLCollection::nextNamedItem(const String &name) const
+{
+ resetCollectionInfo();
+
+ for (Node *n = traverseNextItem(info->current ? info->current : m_base.get()); n; n = traverseNextItem(n)) {
+ if (checkForNameMatch(n, idsDone, name, true)) {
+ info->current = n;
+ return n;
+ }
+ }
+
+ if (idsDone) {
+ info->current = 0;
+ return 0;
+ }
+ idsDone = true;
+
+ for (Node *n = traverseNextItem(info->current ? info->current : m_base.get()); n; n = traverseNextItem(n)) {
+ if (checkForNameMatch(n, idsDone, name, true)) {
+ info->current = n;
+ return n;
+ }
+ }
+
+ return 0;
+}
+
+}
