Chromium Code Reviews| Index: LayoutTests/http/tests/inspector/elements-test.js |
| diff --git a/LayoutTests/http/tests/inspector/elements-test.js b/LayoutTests/http/tests/inspector/elements-test.js |
| index 64428ef5fe952fe01948d1973361f25cf4a6460d..160a1d2df688ba0ab319a2c89b273dc5c3d060b3 100644 |
| --- a/LayoutTests/http/tests/inspector/elements-test.js |
| +++ b/LayoutTests/http/tests/inspector/elements-test.js |
| @@ -2,38 +2,41 @@ var initialize_ElementTest = function() { |
| InspectorTest.findNode = function(matchFunction, callback) |
| { |
| + var originalCallback = callback; |
|
vsevik
2013/06/07 08:41:00
Unused.
pfeldman
2013/06/07 08:53:49
Done.
|
| callback = InspectorTest.safeWrap(callback); |
| var result = null; |
| - var topLevelChildrenRequested = false; |
| var pendingRequests = 0; |
| - function processChildren(topLevel, children) |
| + function processChildren(children) |
| { |
| - pendingRequests--; |
| - if (result) |
| - return; |
| - |
| - for (var i = 0; children && i < children.length; ++i) { |
| - var childNode = children[i]; |
| - if (matchFunction(childNode)) { |
| - result = childNode; |
| - callback(result); |
| + try { |
| + if (result) |
| return; |
| + |
| + for (var i = 0; children && i < children.length; ++i) { |
| + var childNode = children[i]; |
| + if (matchFunction(childNode)) { |
| + result = childNode; |
| + callback(result); |
| + pendingRequests--; |
|
vsevik
2013/06/07 08:41:00
remove
pfeldman
2013/06/07 08:53:49
Done.
|
| + return; |
| + } |
| + pendingRequests++; |
| + childNode.getChildNodes(processChildren); |
| } |
| - pendingRequests++; |
| - childNode.getChildNodes(processChildren.bind(null, false)); |
| + } finally { |
|
apavlov
2013/06/06 16:18:59
Curlies not necessary here? The new styleguide is
|
| + pendingRequests--; |
| } |
| - if (topLevel) |
| - topLevelChildrenRequested = true; |
| - if (topLevelChildrenRequested && !result && !pendingRequests) |
| + if (!result && !pendingRequests) { |
|
apavlov
2013/06/06 16:18:59
ditto
pfeldman
2013/06/07 08:53:49
Done.
|
| callback(null); |
| + } |
| } |
| - pendingRequests++; |
| WebInspector.domAgent.requestDocument(documentRequested.bind(this)); |
| function documentRequested(doc) |
| { |
| - doc.getChildNodes(processChildren.bind(this, true)); |
| + pendingRequests++; |
| + doc.getChildNodes(processChildren); |
| } |
| }; |