Skip to content
Permalink
Browse files
MicroData: Compilation error while building Webkit with --microdata.
https://bugs.webkit.org/show_bug.cgi?id=76703

Patch by Arko Saha <nghq36@motorola.com> on 2012-01-23
Reviewed by Hajime Morita.

* dom/MicroDataItemList.cpp:
(WebCore::MicroDataItemList::MicroDataItemList):
(WebCore::MicroDataItemList::~MicroDataItemList):
* dom/MicroDataItemList.h:
* dom/NodeRareData.h:
(WebCore::NodeRareData::properties):
* html/HTMLPropertiesCollection.cpp:
(WebCore::HTMLPropertiesCollection::create):
(WebCore::HTMLPropertiesCollection::HTMLPropertiesCollection):
* html/HTMLPropertiesCollection.h:

Canonical link: https://commits.webkit.org/93689@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105655 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Arko Saha authored and webkit-commit-queue committed Jan 24, 2012
1 parent 6ffa7c4 commit d83c9724767604a477697667abf461f7b8d05682
Showing 6 changed files with 27 additions and 9 deletions.
@@ -1,3 +1,21 @@
2012-01-23 Arko Saha <nghq36@motorola.com>

MicroData: Compilation error while building Webkit with --microdata.
https://bugs.webkit.org/show_bug.cgi?id=76703

Reviewed by Hajime Morita.

* dom/MicroDataItemList.cpp:
(WebCore::MicroDataItemList::MicroDataItemList):
(WebCore::MicroDataItemList::~MicroDataItemList):
* dom/MicroDataItemList.h:
* dom/NodeRareData.h:
(WebCore::NodeRareData::properties):
* html/HTMLPropertiesCollection.cpp:
(WebCore::HTMLPropertiesCollection::create):
(WebCore::HTMLPropertiesCollection::HTMLPropertiesCollection):
* html/HTMLPropertiesCollection.h:

2012-01-13 David Levin <levin@chromium.org>

[chromium] Convert uses of GetDC to HWndDC.
@@ -38,15 +38,15 @@ namespace WebCore {
using namespace HTMLNames;

MicroDataItemList::MicroDataItemList(PassRefPtr<Node> rootNode, const String& typeNames)
: DynamicNodeList(rootNode)
, m_typeNames(typeNames, m_rootNode->document()->inQuirksMode())
: DynamicSubtreeNodeList(rootNode)
, m_typeNames(typeNames, node()->document()->inQuirksMode())
, m_originalTypeNames(typeNames)
{
}

MicroDataItemList::~MicroDataItemList()
{
m_rootNode->document()->removeCachedMicroDataItemList(this, m_originalTypeNames);
rootNode()->document()->removeCachedMicroDataItemList(this, m_originalTypeNames);
}

bool MicroDataItemList::nodeMatches(Element* testNode) const
@@ -34,7 +34,7 @@

namespace WebCore {

class MicroDataItemList : public DynamicNodeList {
class MicroDataItemList : public DynamicSubtreeNodeList {
public:
static PassRefPtr<MicroDataItemList> create(PassRefPtr<Node> rootNode, const String& typeNames)
{
@@ -220,7 +220,7 @@ class NodeRareData {
HTMLPropertiesCollection* properties(Node* node)
{
if (!m_properties)
m_properties = adoptPtr(HTMLPropertiesCollection::create(node));
m_properties = HTMLPropertiesCollection::create(node);

return m_properties.get();
}
@@ -49,12 +49,12 @@ static inline bool compareTreeOrder(Node* node1, Node* node2)
return (node2->compareDocumentPosition(node1) & (Node::DOCUMENT_POSITION_PRECEDING | Node::DOCUMENT_POSITION_DISCONNECTED)) == Node::DOCUMENT_POSITION_PRECEDING;
}

PassOwnPtr<HTMLPropertiesCollection> HTMLPropertiesCollection::create(PassRefPtr<Node> itemNode)
PassOwnPtr<HTMLPropertiesCollection> HTMLPropertiesCollection::create(Node* itemNode)
{
return adoptPtr(new HTMLPropertiesCollection(itemNode));
}

HTMLPropertiesCollection::HTMLPropertiesCollection(PassRefPtr<Node> itemNode)
HTMLPropertiesCollection::HTMLPropertiesCollection(Node* itemNode)
: HTMLCollection(itemNode, ItemProperties)
, m_propertyNames(DOMStringList::create())
{
@@ -41,7 +41,7 @@ class DOMStringList;

class HTMLPropertiesCollection : public HTMLCollection {
public:
static PassOwnPtr<HTMLPropertiesCollection> create(PassRefPtr<Node>);
static PassOwnPtr<HTMLPropertiesCollection> create(Node*);
virtual ~HTMLPropertiesCollection();

unsigned length() const OVERRIDE;
@@ -51,7 +51,7 @@ class HTMLPropertiesCollection : public HTMLCollection {
PassRefPtr<DOMStringList> names() const;

private:
HTMLPropertiesCollection(PassRefPtr<Node>);
HTMLPropertiesCollection(Node*);

void findPropetiesOfAnItem(Node* current) const;

0 comments on commit d83c972

Please sign in to comment.