diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 13:07:14 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 13:07:14 +0000 |
| commit | f6a2f61481761768352fafff68faca28c9a73bd1 (patch) | |
| tree | e3f2f3aaf7d0b37203215d23de8248cb42416ab8 /webkit/glue/webdevtoolsagent_impl.cc | |
| parent | 251d1dbb34d1e365c78f81bac17ed71ec32cd6c5 (diff) | |
| download | chromium_src-f6a2f61481761768352fafff68faca28c9a73bd1.zip chromium_src-f6a2f61481761768352fafff68faca28c9a73bd1.tar.gz chromium_src-f6a2f61481761768352fafff68faca28c9a73bd1.tar.bz2 | |
DevTools: Implement styles toggle:
1. Split inject.js into injected object and the dispatch.
2. Surround utility function call with try/catch, pass potential exception all way to the client.
3. Fix user and user agent scripts detection
4. Introduce toggleStyle
5. Remove __defineGetter__ from the styles code: make things simple
6. Beautify code.
Review URL: http://codereview.chromium.org/99184
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdevtoolsagent_impl.cc')
| -rw-r--r-- | webkit/glue/webdevtoolsagent_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index 0e4079e..6faba5b 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -195,12 +195,13 @@ void WebDevToolsAgentImpl::ExecuteUtilityFunction( const String& json_args) { Node* node = dom_agent_impl_->GetNodeForId(node_id); String result; + String exception; if (node) { result = debugger_agent_impl_->ExecuteUtilityFunction(function_name, node, - json_args); + json_args, &exception); } tools_agent_delegate_stub_->DidExecuteUtilityFunction(call_id, - result); + result, exception); } void WebDevToolsAgentImpl::ClearConsoleMessages() { @@ -271,4 +272,3 @@ void WebDevToolsAgent::SetMessageLoopDispatchHandler( MessageLoopDispatchHandler handler) { DebuggerAgentManager::SetMessageLoopDispatchHandler(handler); } - |