Build fix after r122115 and some cleanups.

* html/HTMLCollection.h:
(HTMLCollection):
* html/HTMLElement.cpp:
(WebCore::HTMLElement::properties):
* html/HTMLElement.h:
(HTMLElement):
* html/HTMLPropertiesCollection.cpp:
(WebCore::HTMLPropertiesCollection::HTMLPropertiesCollection):
* html/HTMLPropertiesCollection.h:
(HTMLPropertiesCollection):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0bd3dec..ec4a650 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-07-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix after r122115 and some cleanups.
+
+        * html/HTMLCollection.h:
+        (HTMLCollection):
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::properties):
+        * html/HTMLElement.h:
+        (HTMLElement):
+        * html/HTMLPropertiesCollection.cpp:
+        (WebCore::HTMLPropertiesCollection::HTMLPropertiesCollection):
+        * html/HTMLPropertiesCollection.h:
+        (HTMLPropertiesCollection):
+
 2012-07-09  Dean Jackson  <dino@apple.com>
 
         Tiled drawing means some elements can disappear behind the page

diff --git a/Source/WebCore/html/HTMLCollection.h b/Source/WebCore/html/HTMLCollection.h
index f286623..ed980e1 100644 (file)
--- a/Source/WebCore/html/HTMLCollection.h
+++ b/Source/WebCore/html/HTMLCollection.h
@@ -113,7 +113,7 @@ public:
     PassRefPtr<NodeList> tags(const String&);
 
     // Non-DOM API
-    bool hasNamedItem(const AtomicString& name) const;
+    virtual bool hasNamedItem(const AtomicString& name) const;
     void namedItems(const AtomicString& name, Vector<RefPtr<Node> >&) const;
     bool isEmpty() const
     {

diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
index 32fbfa0..c5b5073 100644 (file)
--- a/Source/WebCore/html/HTMLElement.cpp
+++ b/Source/WebCore/html/HTMLElement.cpp
@@ -989,7 +989,7 @@ void HTMLElement::setItemValueText(const String& value, ExceptionCode& ec)
     setTextContent(value, ec);
 }
 
-HTMLPropertiesCollection* HTMLElement::properties()
+PassRefPtr<HTMLPropertiesCollection> HTMLElement::properties()
 {
     return static_cast<HTMLPropertiesCollection*>(ensureCachedHTMLCollection(ItemProperties).get());
 }

diff --git a/Source/WebCore/html/HTMLElement.h b/Source/WebCore/html/HTMLElement.h
index a9ed03f..a5fce0c 100644 (file)
--- a/Source/WebCore/html/HTMLElement.h
+++ b/Source/WebCore/html/HTMLElement.h
@@ -97,7 +97,7 @@ public:
 #if ENABLE(MICRODATA)
     void setItemValue(const String&, ExceptionCode&);
     PassRefPtr<MicroDataItemValue> itemValue() const;
-    HTMLPropertiesCollection* properties();
+    PassRefPtr<HTMLPropertiesCollection> properties();
 #endif
 
 #ifndef NDEBUG

diff --git a/Source/WebCore/html/HTMLPropertiesCollection.cpp b/Source/WebCore/html/HTMLPropertiesCollection.cpp
index 9f15f4f..90dc97c 100644 (file)
--- a/Source/WebCore/html/HTMLPropertiesCollection.cpp
+++ b/Source/WebCore/html/HTMLPropertiesCollection.cpp
@@ -53,6 +53,7 @@ PassRefPtr<HTMLPropertiesCollection> HTMLPropertiesCollection::create(Node* item
 HTMLPropertiesCollection::HTMLPropertiesCollection(Node* itemNode)
     : HTMLCollection(itemNode, ItemProperties)
 {
+    m_cache.clear();
 }
 
 HTMLPropertiesCollection::~HTMLPropertiesCollection()

diff --git a/Source/WebCore/html/HTMLPropertiesCollection.h b/Source/WebCore/html/HTMLPropertiesCollection.h
index ea9ab49..261eca3 100644 (file)
--- a/Source/WebCore/html/HTMLPropertiesCollection.h
+++ b/Source/WebCore/html/HTMLPropertiesCollection.h
@@ -51,8 +51,8 @@ public:
 
     PassRefPtr<DOMStringList> names() const;
 
-    PassRefPtr<NodeList> namedItem(const String&) const;
-    bool hasNamedItem(const AtomicString&) const;
+    virtual PassRefPtr<NodeList> namedItem(const String&) const OVERRIDE;
+    virtual bool hasNamedItem(const AtomicString&) const OVERRIDE;
 
 private:
     HTMLPropertiesCollection(Node*);