diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
| commit | 32761a6cee1d0dee366b885b7b9c777e67885688 (patch) | |
| tree | d6bec92bebfb216f4126356e55518842c2f476a1 /Source/WebCore/rendering/CounterNode.cpp | |
| parent | a4e969f4965059196ca948db781e52f7cfebf19e (diff) | |
| download | WebKitGtk-tarball-32761a6cee1d0dee366b885b7b9c777e67885688.tar.gz | |
webkitgtk-2.4.11webkitgtk-2.4.11
Diffstat (limited to 'Source/WebCore/rendering/CounterNode.cpp')
| -rw-r--r-- | Source/WebCore/rendering/CounterNode.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/CounterNode.cpp b/Source/WebCore/rendering/CounterNode.cpp index 326ac98b9..bf1ad91eb 100644 --- a/Source/WebCore/rendering/CounterNode.cpp +++ b/Source/WebCore/rendering/CounterNode.cpp @@ -28,11 +28,11 @@ namespace WebCore { -CounterNode::CounterNode(RenderElement& owner, bool hasResetType, int value) +CounterNode::CounterNode(RenderElement* o, bool hasResetType, int value) : m_hasResetType(hasResetType) , m_value(value) , m_countInParent(0) - , m_owner(owner) + , m_owner(o) , m_rootRenderer(0) , m_parent(0) , m_previousSibling(0) @@ -90,9 +90,9 @@ CounterNode::~CounterNode() resetRenderers(); } -Ref<CounterNode> CounterNode::create(RenderElement& owner, bool hasResetType, int value) +PassRefPtr<CounterNode> CounterNode::create(RenderElement* owner, bool hasResetType, int value) { - return adoptRef(*new CounterNode(owner, hasResetType, value)); + return adoptRef(new CounterNode(owner, hasResetType, value)); } CounterNode* CounterNode::nextInPreOrderAfterChildren(const CounterNode* stayWithin) const @@ -350,7 +350,7 @@ void CounterNode::removeChild(CounterNode* oldChild) next->recount(); } -#if ENABLE(TREE_DEBUGGING) +#ifndef NDEBUG static void showTreeAndMark(const CounterNode* node) { @@ -365,7 +365,7 @@ static void showTreeAndMark(const CounterNode* node) fprintf(stderr, "%p %s: %d %d P:%p PS:%p NS:%p R:%p\n", current, current->actsAsReset() ? "reset____" : "increment", current->value(), current->countInParent(), current->parent(), current->previousSibling(), - current->nextSibling(), ¤t->owner()); + current->nextSibling(), current->owner()); } fflush(stderr); } @@ -374,7 +374,7 @@ static void showTreeAndMark(const CounterNode* node) } // namespace WebCore -#if ENABLE(TREE_DEBUGGING) +#ifndef NDEBUG void showCounterTree(const WebCore::CounterNode* counter) { |