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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorCSSAgent.h

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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 VectorStringHashTraits, 325 VectorStringHashTraits,
326 VectorStringHashTraits>; 326 VectorStringHashTraits>;
327 327
328 void visitLayoutTreeNodes( 328 void visitLayoutTreeNodes(
329 Node*, 329 Node*,
330 protocol::Array<protocol::CSS::LayoutTreeNode>& layoutTreeNodes, 330 protocol::Array<protocol::CSS::LayoutTreeNode>& layoutTreeNodes,
331 const Vector<std::pair<String, CSSPropertyID>>& cssPropertyWhitelist, 331 const Vector<std::pair<String, CSSPropertyID>>& cssPropertyWhitelist,
332 ComputedStylesMap& styleToIndexMap, 332 ComputedStylesMap& styleToIndexMap,
333 protocol::Array<protocol::CSS::ComputedStyle>& computedStyles); 333 protocol::Array<protocol::CSS::ComputedStyle>& computedStyles);
334 334
335 // A non-zero index corresponds to a style in |computedStyles|, -1 means an
336 // empty style.
335 int getStyleIndexForNode( 337 int getStyleIndexForNode(
336 Node*, 338 Node*,
337 const Vector<std::pair<String, CSSPropertyID>>& cssPropertyWhitelist, 339 const Vector<std::pair<String, CSSPropertyID>>& cssPropertyWhitelist,
338 ComputedStylesMap& styleToIndexMap, 340 ComputedStylesMap& styleToIndexMap,
339 protocol::Array<protocol::CSS::ComputedStyle>& computedStyles); 341 protocol::Array<protocol::CSS::ComputedStyle>& computedStyles);
340 342
341 Member<InspectorDOMAgent> m_domAgent; 343 Member<InspectorDOMAgent> m_domAgent;
342 Member<InspectedFrames> m_inspectedFrames; 344 Member<InspectedFrames> m_inspectedFrames;
343 Member<InspectorNetworkAgent> m_networkAgent; 345 Member<InspectorNetworkAgent> m_networkAgent;
344 Member<InspectorResourceContentLoader> m_resourceContentLoader; 346 Member<InspectorResourceContentLoader> m_resourceContentLoader;
(...skipping 16 matching lines...) Expand all
361 363
362 int m_resourceContentLoaderClientId; 364 int m_resourceContentLoaderClientId;
363 365
364 friend class InspectorResourceContentLoaderCallback; 366 friend class InspectorResourceContentLoaderCallback;
365 friend class StyleSheetBinder; 367 friend class StyleSheetBinder;
366 }; 368 };
367 369
368 } // namespace blink 370 } // namespace blink
369 371
370 #endif // !defined(InspectorCSSAgent_h) 372 #endif // !defined(InspectorCSSAgent_h)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698