Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: headless/public/util/dom_tree_extractor.cc

Issue 2455613002: Fix index used to join results of DOM.getDocument and CSS.getLayoutTreeAndStyles (Closed)
Patch Set: Fix skew between property names and values when emepty ones are skipped. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | headless/public/util/dom_tree_extractor_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "headless/public/util/dom_tree_extractor.h" 5 #include "headless/public/util/dom_tree_extractor.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "headless/public/headless_devtools_client.h" 9 #include "headless/public/headless_devtools_client.h"
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 for (const std::unique_ptr<dom::Node>& child : *node->GetChildren()) { 78 for (const std::unique_ptr<dom::Node>& child : *node->GetChildren()) {
79 EnumerateNodes(child.get()); 79 EnumerateNodes(child.get());
80 } 80 }
81 } 81 }
82 } 82 }
83 83
84 void DomTreeExtractor::ExtractLayoutTreeNodes() { 84 void DomTreeExtractor::ExtractLayoutTreeNodes() {
85 dom_tree_.layout_tree_nodes_.reserve( 85 dom_tree_.layout_tree_nodes_.reserve(
86 dom_tree_.layout_tree_and_styles_result_->GetLayoutTreeNodes()->size()); 86 dom_tree_.layout_tree_and_styles_result_->GetLayoutTreeNodes()->size());
87 87
88 // Only extract layout tree nodes that map to a DOM node.
89 for (const std::unique_ptr<css::LayoutTreeNode>& layout_node : 88 for (const std::unique_ptr<css::LayoutTreeNode>& layout_node :
90 *dom_tree_.layout_tree_and_styles_result_->GetLayoutTreeNodes()) { 89 *dom_tree_.layout_tree_and_styles_result_->GetLayoutTreeNodes()) {
91 std::unordered_map<NodeId, size_t>::const_iterator it = 90 std::unordered_map<NodeId, size_t>::const_iterator it =
92 dom_tree_.node_id_to_index_.find(layout_node->GetBackendNodeId()); 91 dom_tree_.node_id_to_index_.find(layout_node->GetNodeId());
93 if (it == dom_tree_.node_id_to_index_.end()) 92 DCHECK(it != dom_tree_.node_id_to_index_.end());
94 continue;
95
96 dom_tree_.layout_tree_nodes_.push_back(layout_node.get()); 93 dom_tree_.layout_tree_nodes_.push_back(layout_node.get());
97 } 94 }
98 } 95 }
99 96
100 void DomTreeExtractor::ExtractComputedStyles() { 97 void DomTreeExtractor::ExtractComputedStyles() {
101 dom_tree_.computed_styles_.reserve( 98 dom_tree_.computed_styles_.reserve(
102 dom_tree_.layout_tree_and_styles_result_->GetComputedStyles()->size()); 99 dom_tree_.layout_tree_and_styles_result_->GetComputedStyles()->size());
103 100
104 for (const std::unique_ptr<css::ComputedStyle>& computed_style : 101 for (const std::unique_ptr<css::ComputedStyle>& computed_style :
105 *dom_tree_.layout_tree_and_styles_result_->GetComputedStyles()) { 102 *dom_tree_.layout_tree_and_styles_result_->GetComputedStyles()) {
106 dom_tree_.computed_styles_.push_back(computed_style.get()); 103 dom_tree_.computed_styles_.push_back(computed_style.get());
107 } 104 }
108 } 105 }
109 106
110 DomTreeExtractor::DomTree::DomTree() {} 107 DomTreeExtractor::DomTree::DomTree() {}
111 DomTreeExtractor::DomTree::~DomTree() {} 108 DomTreeExtractor::DomTree::~DomTree() {}
112 109
113 DomTreeExtractor::DomTree::DomTree(DomTree&& other) = default; 110 DomTreeExtractor::DomTree::DomTree(DomTree&& other) = default;
114 111
115 } // namespace headless 112 } // namespace headless
OLDNEW
« no previous file with comments | « no previous file | headless/public/util/dom_tree_extractor_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698