| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2004-2011, 2014 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004-2011, 2014 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 : m_renderer(renderer) | 99 : m_renderer(renderer) |
| 100 { } | 100 { } |
| 101 | 101 |
| 102 protected: | 102 protected: |
| 103 // Oilpan: This member is traced in NodeRareData. | 103 // Oilpan: This member is traced in NodeRareData. |
| 104 // FIXME: Can we add traceAfterDispatch and finalizeGarbageCollectedObject | 104 // FIXME: Can we add traceAfterDispatch and finalizeGarbageCollectedObject |
| 105 // to NodeRareDataBase, and make m_renderer Member<>? | 105 // to NodeRareDataBase, and make m_renderer Member<>? |
| 106 RenderObject* m_renderer; | 106 RenderObject* m_renderer; |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 #if ENABLE(OILPAN) | |
| 110 #define NODE_BASE_CLASSES public GarbageCollectedFinalized<Node>, public EventTa
rget | |
| 111 #else | |
| 112 // TreeShared should be the last to pack TreeShared::m_refCount and | 109 // TreeShared should be the last to pack TreeShared::m_refCount and |
| 113 // Node::m_nodeFlags on 64bit platforms. | 110 // Node::m_nodeFlags on 64bit platforms. |
| 114 #define NODE_BASE_CLASSES public EventTarget, public TreeShared<Node> | 111 #define NODE_BASE_CLASSES public EventTarget, public TreeShared<Node> |
| 115 #endif | |
| 116 | 112 |
| 117 class Node : NODE_BASE_CLASSES { | 113 class Node : NODE_BASE_CLASSES { |
| 118 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(TreeShared<Node>); | 114 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(TreeShared<Node>); |
| 119 DEFINE_WRAPPERTYPEINFO(); | 115 DEFINE_WRAPPERTYPEINFO(); |
| 120 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Node); | 116 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Node); |
| 121 friend class Document; | 117 friend class Document; |
| 122 friend class TreeScope; | 118 friend class TreeScope; |
| 123 friend class TreeScopeAdopter; | 119 friend class TreeScopeAdopter; |
| 124 public: | 120 public: |
| 125 enum NodeType { | 121 enum NodeType { |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 810 } // namespace blink | 806 } // namespace blink |
| 811 | 807 |
| 812 #ifndef NDEBUG | 808 #ifndef NDEBUG |
| 813 // Outside the WebCore namespace for ease of invocation from gdb. | 809 // Outside the WebCore namespace for ease of invocation from gdb. |
| 814 void showNode(const blink::Node*); | 810 void showNode(const blink::Node*); |
| 815 void showTree(const blink::Node*); | 811 void showTree(const blink::Node*); |
| 816 void showNodePath(const blink::Node*); | 812 void showNodePath(const blink::Node*); |
| 817 #endif | 813 #endif |
| 818 | 814 |
| 819 #endif // Node_h | 815 #endif // Node_h |
| OLD | NEW |