Source/core/inspector/InspectorDOMAgent.cpp - Issue 1286483003: Devtools UI: Update inspect element node description label UI

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

Issue 1286483003: Devtools UI: Update inspect element node description label UI (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase tests Created 5 years, 4 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 | « LayoutTests/inspector/elements/highlight/highlight-svg-root-zoomed-expected.txt ('k') | Source/core/inspector/InspectorHighlight.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 1237 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1248 highlightConfig->showInfo = showInfo;	1248 highlightConfig->showInfo = showInfo;

1249 bool showRulers = false; // Default: false (do not show rulers).	1249 bool showRulers = false; // Default: false (do not show rulers).

1250 highlightInspectorObject->getBoolean("showRulers", &showRulers);	1250 highlightInspectorObject->getBoolean("showRulers", &showRulers);

1251 highlightConfig->showRulers = showRulers;	1251 highlightConfig->showRulers = showRulers;

1252 bool showExtensionLines = false; // Default: false (do not show extension li nes).	1252 bool showExtensionLines = false; // Default: false (do not show extension li nes).

1253 highlightInspectorObject->getBoolean("showExtensionLines", &showExtensionLin es);	1253 highlightInspectorObject->getBoolean("showExtensionLines", &showExtensionLin es);

1254 highlightConfig->showExtensionLines = showExtensionLines;	1254 highlightConfig->showExtensionLines = showExtensionLines;

1255 bool showLayoutEditor = false;	1255 bool showLayoutEditor = false;

1256 highlightInspectorObject->getBoolean("showLayoutEditor", &showLayoutEditor);	1256 highlightInspectorObject->getBoolean("showLayoutEditor", &showLayoutEditor);

1257 highlightConfig->showLayoutEditor = showLayoutEditor;	1257 highlightConfig->showLayoutEditor = showLayoutEditor;

	1258 bool displayAsMaterial = false;

	1259 highlightInspectorObject->getBoolean("displayAsMaterial", &displayAsMaterial );

	1260 highlightConfig->displayAsMaterial = displayAsMaterial;

1258 highlightConfig->content = parseConfigColor("contentColor", highlightInspect orObject);	1261 highlightConfig->content = parseConfigColor("contentColor", highlightInspect orObject);

1259 highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", hi ghlightInspectorObject);	1262 highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", hi ghlightInspectorObject);

1260 highlightConfig->padding = parseConfigColor("paddingColor", highlightInspect orObject);	1263 highlightConfig->padding = parseConfigColor("paddingColor", highlightInspect orObject);

1261 highlightConfig->border = parseConfigColor("borderColor", highlightInspector Object);	1264 highlightConfig->border = parseConfigColor("borderColor", highlightInspector Object);

1262 highlightConfig->margin = parseConfigColor("marginColor", highlightInspector Object);	1265 highlightConfig->margin = parseConfigColor("marginColor", highlightInspector Object);

1263 highlightConfig->eventTarget = parseConfigColor("eventTargetColor", highligh tInspectorObject);	1266 highlightConfig->eventTarget = parseConfigColor("eventTargetColor", highligh tInspectorObject);

1264 highlightConfig->shape = parseConfigColor("shapeColor", highlightInspectorOb ject);	1267 highlightConfig->shape = parseConfigColor("shapeColor", highlightInspectorOb ject);

1265 highlightConfig->shapeMargin = parseConfigColor("shapeMarginColor", highligh tInspectorObject);	1268 highlightConfig->shapeMargin = parseConfigColor("shapeMarginColor", highligh tInspectorObject);

1266	1269

1267 return highlightConfig.release();	1270 return highlightConfig.release();

(...skipping 970 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2238 visitor->trace(m_revalidateTask);	2241 visitor->trace(m_revalidateTask);

2239 visitor->trace(m_searchResults);	2242 visitor->trace(m_searchResults);

2240 #endif	2243 #endif

2241 visitor->trace(m_hoveredNodeForInspectMode);	2244 visitor->trace(m_hoveredNodeForInspectMode);

2242 visitor->trace(m_history);	2245 visitor->trace(m_history);

2243 visitor->trace(m_domEditor);	2246 visitor->trace(m_domEditor);

2244 InspectorBaseAgent::trace(visitor);	2247 InspectorBaseAgent::trace(visitor);

2245 }	2248 }

2246	2249

2247 } // namespace blink	2250 } // namespace blink

OLD	NEW