diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebKit/chromium/src/WebDevToolsAgentImpl.cpp | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebKit/chromium/src/WebDevToolsAgentImpl.cpp')
| -rw-r--r-- | WebKit/chromium/src/WebDevToolsAgentImpl.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp index 4205c62..0d8cbad 100644 --- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp +++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp @@ -231,9 +231,7 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl( WebDevToolsAgentImpl::~WebDevToolsAgentImpl() { DebuggerAgentManager::onWebViewClosed(m_webViewImpl); -#if ENABLE(V8_SCRIPT_DEBUG_SERVER) ClientMessageLoopAdapter::inspectedViewClosed(m_webViewImpl); -#endif disposeUtilityContext(); } @@ -250,10 +248,8 @@ void WebDevToolsAgentImpl::attach() if (m_attached) return; -#if ENABLE(V8_SCRIPT_DEBUG_SERVER) if (!m_client->exposeV8DebuggerProtocol()) ClientMessageLoopAdapter::ensureClientMessageLoopCreated(m_client); -#endif m_debuggerAgentImpl.set( new DebuggerAgentImpl(m_webViewImpl, @@ -294,9 +290,7 @@ void WebDevToolsAgentImpl::detach() void WebDevToolsAgentImpl::didNavigate() { -#if ENABLE(V8_SCRIPT_DEBUG_SERVER) ClientMessageLoopAdapter::didNavigate(); -#endif DebuggerAgentManager::onNavigate(); } @@ -432,11 +426,9 @@ void WebDevToolsAgentImpl::createInspectorFrontendProxy() m_utilityContext = v8::Context::New(); compileUtilityScripts(); initDevToolsAgentHost(); -#if ENABLE(V8_SCRIPT_DEBUG_SERVER) WebCString debuggerScriptJs = m_client->debuggerScriptSource(); WebCore::ScriptDebugServer::shared().setDebuggerScriptSource( WebCore::String(debuggerScriptJs.data(), debuggerScriptJs.length())); -#endif } void WebDevToolsAgentImpl::setInspectorFrontendProxyToInspectorController() |