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

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

Issue 11366221: Merge 133885 - Web Inspector: Add option to disable rulers (Elements panel) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 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) 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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 { 1035 {
1036 if (!highlightInspectorObject) { 1036 if (!highlightInspectorObject) {
1037 *errorString = "Internal error: highlight configuration parameter is mis sing"; 1037 *errorString = "Internal error: highlight configuration parameter is mis sing";
1038 return nullptr; 1038 return nullptr;
1039 } 1039 }
1040 1040
1041 OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig()); 1041 OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
1042 bool showInfo = false; // Default: false (do not show a tooltip). 1042 bool showInfo = false; // Default: false (do not show a tooltip).
1043 highlightInspectorObject->getBoolean("showInfo", &showInfo); 1043 highlightInspectorObject->getBoolean("showInfo", &showInfo);
1044 highlightConfig->showInfo = showInfo; 1044 highlightConfig->showInfo = showInfo;
1045 bool showRulers = false; // Default: false (do not show rulers).
1046 highlightInspectorObject->getBoolean("showRulers", &showRulers);
1047 highlightConfig->showRulers = showRulers;
1045 highlightConfig->content = parseConfigColor("contentColor", highlightInspect orObject); 1048 highlightConfig->content = parseConfigColor("contentColor", highlightInspect orObject);
1046 highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", hi ghlightInspectorObject); 1049 highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", hi ghlightInspectorObject);
1047 highlightConfig->padding = parseConfigColor("paddingColor", highlightInspect orObject); 1050 highlightConfig->padding = parseConfigColor("paddingColor", highlightInspect orObject);
1048 highlightConfig->border = parseConfigColor("borderColor", highlightInspector Object); 1051 highlightConfig->border = parseConfigColor("borderColor", highlightInspector Object);
1049 highlightConfig->margin = parseConfigColor("marginColor", highlightInspector Object); 1052 highlightConfig->margin = parseConfigColor("marginColor", highlightInspector Object);
1050 return highlightConfig.release(); 1053 return highlightConfig.release();
1051 } 1054 }
1052 1055
1053 void InspectorDOMAgent::setInspectModeEnabled(ErrorString* errorString, bool ena bled, const RefPtr<InspectorObject>* highlightConfig) 1056 void InspectorDOMAgent::setInspectModeEnabled(ErrorString* errorString, bool ena bled, const RefPtr<InspectorObject>* highlightConfig)
1054 { 1057 {
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m ainWorldScriptState(frame)); 1609 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m ainWorldScriptState(frame));
1607 if (injectedScript.hasNoValue()) 1610 if (injectedScript.hasNoValue())
1608 return 0; 1611 return 0;
1609 1612
1610 return injectedScript.wrapNode(node, objectGroup); 1613 return injectedScript.wrapNode(node, objectGroup);
1611 } 1614 }
1612 1615
1613 } // namespace WebCore 1616 } // namespace WebCore
1614 1617
1615 #endif // ENABLE(INSPECTOR) 1618 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/English.lproj/localizedStrings.js ('k') | Source/WebCore/inspector/InspectorOverlay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698