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

Side by Side Diff: Source/core/inspector/InspectorDOMAgent.cpp

Issue 900903002: DevTools: do not use Internals for inspector highlight tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review comment addressed. Created 5 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.h ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after
2251 if (!renderer) { 2251 if (!renderer) {
2252 *errorString = "No renderer for node, perhaps orphan or hidden node"; 2252 *errorString = "No renderer for node, perhaps orphan or hidden node";
2253 return; 2253 return;
2254 } 2254 }
2255 while (renderer && !renderer->isDocumentElement() && !renderer->isRelayoutBo undaryForInspector()) 2255 while (renderer && !renderer->isDocumentElement() && !renderer->isRelayoutBo undaryForInspector())
2256 renderer = renderer->container(); 2256 renderer = renderer->container();
2257 Node* resultNode = renderer ? renderer->generatingNode() : node->ownerDocume nt(); 2257 Node* resultNode = renderer ? renderer->generatingNode() : node->ownerDocume nt();
2258 *relayoutBoundaryNodeId = pushNodePathToFrontend(resultNode); 2258 *relayoutBoundaryNodeId = pushNodePathToFrontend(resultNode);
2259 } 2259 }
2260 2260
2261 void InspectorDOMAgent::getHighlightObjectForTest(ErrorString* errorString, int nodeId, RefPtr<JSONObject>& result)
2262 {
2263 Node* node = assertNode(errorString, nodeId);
2264 if (!node)
2265 return;
2266 result = m_overlay->highlightJSONForNode(node);
2267 }
2268
2261 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(No de* node, const String& objectGroup) 2269 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(No de* node, const String& objectGroup)
2262 { 2270 {
2263 Document* document = node->isDocumentNode() ? &node->document() : node->owne rDocument(); 2271 Document* document = node->isDocumentNode() ? &node->document() : node->owne rDocument();
2264 LocalFrame* frame = document ? document->frame() : nullptr; 2272 LocalFrame* frame = document ? document->frame() : nullptr;
2265 if (!frame) 2273 if (!frame)
2266 return nullptr; 2274 return nullptr;
2267 2275
2268 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(S criptState::forMainWorld(frame)); 2276 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(S criptState::forMainWorld(frame));
2269 if (injectedScript.isEmpty()) 2277 if (injectedScript.isEmpty())
2270 return nullptr; 2278 return nullptr;
(...skipping 25 matching lines...) Expand all
2296 visitor->trace(m_revalidateTask); 2304 visitor->trace(m_revalidateTask);
2297 visitor->trace(m_searchResults); 2305 visitor->trace(m_searchResults);
2298 #endif 2306 #endif
2299 visitor->trace(m_history); 2307 visitor->trace(m_history);
2300 visitor->trace(m_domEditor); 2308 visitor->trace(m_domEditor);
2301 visitor->trace(m_listener); 2309 visitor->trace(m_listener);
2302 InspectorBaseAgent::trace(visitor); 2310 InspectorBaseAgent::trace(visitor);
2303 } 2311 }
2304 2312
2305 } // namespace blink 2313 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.h ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698