Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #ifndef ContentDistribution_h | 31 #ifndef ContentDistribution_h |
| 32 #define ContentDistribution_h | 32 #define ContentDistribution_h |
| 33 | 33 |
| 34 #include "core/dom/Node.h" | 34 #include "core/dom/Node.h" |
| 35 #include "wtf/Forward.h" | 35 #include "wtf/Forward.h" |
| 36 #include "wtf/HashMap.h" | 36 #include "wtf/HashMap.h" |
| 37 #include "wtf/Vector.h" | 37 #include "wtf/Vector.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 class ContentDistribution { | 41 class ContentDistribution FINAL { |
| 42 ALLOW_ONLY_INLINE_ALLOCATION(); | |
|
haraken
2014/05/12 12:21:38
This should be DISALLOW_ALLOCATION, since ContentD
sof
2014/05/12 12:37:49
Yes, got my DISALLOW_ALLOCATION() vs ALLOW_ONLY_IN
| |
| 42 public: | 43 public: |
| 43 ContentDistribution() { m_nodes.reserveInitialCapacity(32); } | 44 ContentDistribution() { m_nodes.reserveInitialCapacity(32); } |
| 44 | 45 |
| 45 PassRefPtr<Node> first() const { return m_nodes.first(); } | 46 PassRefPtrWillBeRawPtr<Node> first() const { return m_nodes.first(); } |
| 46 PassRefPtr<Node> last() const { return m_nodes.last(); } | 47 PassRefPtrWillBeRawPtr<Node> last() const { return m_nodes.last(); } |
| 47 PassRefPtr<Node> at(size_t index) const { return m_nodes.at(index); } | 48 PassRefPtrWillBeRawPtr<Node> at(size_t index) const { return m_nodes.at(inde x); } |
| 48 | 49 |
| 49 size_t size() const { return m_nodes.size(); } | 50 size_t size() const { return m_nodes.size(); } |
| 50 bool isEmpty() const { return m_nodes.isEmpty(); } | 51 bool isEmpty() const { return m_nodes.isEmpty(); } |
| 51 | 52 |
| 52 void append(PassRefPtr<Node>); | 53 void append(PassRefPtrWillBeRawPtr<Node>); |
| 53 void clear() { m_nodes.clear(); m_indices.clear(); } | 54 void clear() { m_nodes.clear(); m_indices.clear(); } |
| 54 void shrinkToFit() { m_nodes.shrinkToFit(); } | 55 void shrinkToFit() { m_nodes.shrinkToFit(); } |
| 55 | 56 |
| 56 bool contains(const Node* node) const { return m_indices.contains(node); } | 57 bool contains(const Node* node) const { return m_indices.contains(const_cast <Node*>(node)); } |
| 57 size_t find(const Node*) const; | 58 size_t find(const Node*) const; |
| 58 Node* nextTo(const Node*) const; | 59 Node* nextTo(const Node*) const; |
| 59 Node* previousTo(const Node*) const; | 60 Node* previousTo(const Node*) const; |
| 60 | 61 |
| 61 void swap(ContentDistribution& other); | 62 void swap(ContentDistribution& other); |
| 62 | 63 |
| 63 const Vector<RefPtr<Node> >& nodes() const { return m_nodes; } | 64 const WillBeHeapVector<RefPtrWillBeMember<Node> >& nodes() const { return m_ nodes; } |
| 65 | |
| 66 void traceAfterDispatch(Visitor*); | |
|
haraken
2014/05/12 12:21:38
Then you can simply use trace().
| |
| 64 | 67 |
| 65 private: | 68 private: |
| 66 Vector<RefPtr<Node> > m_nodes; | 69 WillBeHeapVector<RefPtrWillBeMember<Node> > m_nodes; |
| 67 HashMap<const Node*, size_t> m_indices; | 70 WillBeHeapHashMap<RawPtrWillBeMember<Node>, size_t> m_indices; |
| 68 }; | 71 }; |
| 69 | 72 |
| 70 } | 73 } |
| 71 | 74 |
| 72 #endif | 75 #endif |
| OLD | NEW |