| Index: net/spdy/spdy_priority_forest.h
|
| diff --git a/net/spdy/spdy_priority_forest.h b/net/spdy/spdy_priority_forest.h
|
| index 8624bbfe8eeac441b372bb7b2815035c5810a33a..cbfd0b75c09e3474246db2a1bf717a233a820547 100644
|
| --- a/net/spdy/spdy_priority_forest.h
|
| +++ b/net/spdy/spdy_priority_forest.h
|
| @@ -119,7 +119,7 @@ class SpdyPriorityForest {
|
| unsigned int flags; // bitfield of flags
|
| union {
|
| Priority priority; // used for root nodes
|
| - NodeId parent_id; // used for non-root nodes
|
| + NodeId parent_id; // used for non-root nodes
|
| } depends_on;
|
| NodeId child; // node ID of child (or NodeId() for no child)
|
| };
|
| @@ -149,10 +149,12 @@ class SpdyPriorityForest {
|
| };
|
|
|
| template <typename NodeId, typename Priority>
|
| -SpdyPriorityForest<NodeId, Priority>::SpdyPriorityForest() {}
|
| +SpdyPriorityForest<NodeId, Priority>::SpdyPriorityForest() {
|
| +}
|
|
|
| template <typename NodeId, typename Priority>
|
| -SpdyPriorityForest<NodeId, Priority>::~SpdyPriorityForest() {}
|
| +SpdyPriorityForest<NodeId, Priority>::~SpdyPriorityForest() {
|
| +}
|
|
|
| template <typename NodeId, typename Priority>
|
| int SpdyPriorityForest<NodeId, Priority>::num_nodes() const {
|
| @@ -165,8 +167,8 @@ bool SpdyPriorityForest<NodeId, Priority>::NodeExists(NodeId node_id) const {
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::AddRootNode(
|
| - NodeId node_id, Priority priority) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::AddRootNode(NodeId node_id,
|
| + Priority priority) {
|
| if (NodeExists(node_id)) {
|
| return false;
|
| }
|
| @@ -177,8 +179,9 @@ bool SpdyPriorityForest<NodeId, Priority>::AddRootNode(
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::AddNonRootNode(
|
| - NodeId node_id, NodeId parent_id, bool unordered) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::AddNonRootNode(NodeId node_id,
|
| + NodeId parent_id,
|
| + bool unordered) {
|
| if (NodeExists(node_id) || !NodeExists(parent_id)) {
|
| return false;
|
| }
|
| @@ -274,8 +277,8 @@ NodeId SpdyPriorityForest<NodeId, Priority>::GetChild(NodeId node_id) const {
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::SetPriority(
|
| - NodeId node_id, Priority priority) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::SetPriority(NodeId node_id,
|
| + Priority priority) {
|
| if (!NodeExists(node_id)) {
|
| return false;
|
| }
|
| @@ -294,8 +297,9 @@ bool SpdyPriorityForest<NodeId, Priority>::SetPriority(
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::SetParent(
|
| - NodeId node_id, NodeId parent_id, bool unordered) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::SetParent(NodeId node_id,
|
| + NodeId parent_id,
|
| + bool unordered) {
|
| if (!NodeExists(node_id) || !NodeExists(parent_id)) {
|
| return false;
|
| }
|
| @@ -314,11 +318,13 @@ bool SpdyPriorityForest<NodeId, Priority>::SetParent(
|
| }
|
|
|
| // Next, make sure we won't create a cycle.
|
| - if (node_id == parent_id) return false;
|
| + if (node_id == parent_id)
|
| + return false;
|
| Node* last = node;
|
| NodeId last_id = node_id;
|
| while (last->child != NodeId()) {
|
| - if (last->child == parent_id) return false;
|
| + if (last->child == parent_id)
|
| + return false;
|
| last_id = last->child;
|
| DCHECK(NodeExists(last_id));
|
| last = &all_nodes_[last_id];
|
| @@ -387,15 +393,15 @@ NodeId SpdyPriorityForest<NodeId, Priority>::NextNodeToWrite() {
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::IsMarked(
|
| - NodeId node_id, unsigned int flag) const {
|
| +bool SpdyPriorityForest<NodeId, Priority>::IsMarked(NodeId node_id,
|
| + unsigned int flag) const {
|
| const Node* node = FindNode(node_id);
|
| return node != NULL && (node->flags & flag) != 0;
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::Mark(
|
| - NodeId node_id, unsigned int flag) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::Mark(NodeId node_id,
|
| + unsigned int flag) {
|
| if (!NodeExists(node_id)) {
|
| return false;
|
| }
|
| @@ -404,8 +410,8 @@ bool SpdyPriorityForest<NodeId, Priority>::Mark(
|
| }
|
|
|
| template <typename NodeId, typename Priority>
|
| -bool SpdyPriorityForest<NodeId, Priority>::Unmark(
|
| - NodeId node_id, unsigned int flag) {
|
| +bool SpdyPriorityForest<NodeId, Priority>::Unmark(NodeId node_id,
|
| + unsigned int flag) {
|
| if (!NodeExists(node_id)) {
|
| return false;
|
| }
|
| @@ -422,12 +428,13 @@ NodeId SpdyPriorityForest<NodeId, Priority>::FirstMarkedNode(
|
| uint64 total_weight = 0;
|
| std::map<uint64, NodeId> roots; // maps cumulative weight to root node ID
|
| for (typename NodeMap::const_iterator iter = all_nodes_.begin();
|
| - iter != all_nodes_.end(); ++iter) {
|
| + iter != all_nodes_.end();
|
| + ++iter) {
|
| const NodeId root_id = iter->first;
|
| const Node& root = iter->second;
|
| if (root.type == ROOT_NODE) {
|
| // See if there is at least one marked node in this root's chain.
|
| - for (const Node* node = &root; ; node = &all_nodes_[node->child]) {
|
| + for (const Node* node = &root;; node = &all_nodes_[node->child]) {
|
| if ((node->flags & flag) != 0) {
|
| total_weight += static_cast<uint64>(root.depends_on.priority);
|
| roots[total_weight] = root_id;
|
| @@ -467,7 +474,7 @@ NodeId SpdyPriorityForest<NodeId, Priority>::FirstMarkedNode(
|
| group.push_back(node_id);
|
| for (Node* next = node; next->child != NodeId();) {
|
| DCHECK(NodeExists(next->child));
|
| - Node *child = &all_nodes_[next->child];
|
| + Node* child = &all_nodes_[next->child];
|
| DCHECK_NE(ROOT_NODE, child->type);
|
| if (child->type != NONROOT_UNORDERED) {
|
| break;
|
| @@ -496,7 +503,8 @@ SpdyPriorityForest<NodeId, Priority>::FindNode(NodeId node_id) const {
|
| template <typename NodeId, typename Priority>
|
| bool SpdyPriorityForest<NodeId, Priority>::ValidateInvariantsForTests() const {
|
| for (typename NodeMap::const_iterator iter = all_nodes_.begin();
|
| - iter != all_nodes_.end(); ++iter) {
|
| + iter != all_nodes_.end();
|
| + ++iter) {
|
| const NodeId node_id = iter->first;
|
| const Node& node = iter->second;
|
| if (node.type != ROOT_NODE &&
|
|
|