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

Unified Diff: WebCore/inspector/InspectorController.cpp

Issue 3389017: Merge 67623 - 2010-09-16 Yury Semikhatsky <yurys@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/inspector/InspectorController.h ('k') | WebKit/chromium/src/WebDevToolsAgentImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/inspector/InspectorController.cpp
===================================================================
--- WebCore/inspector/InspectorController.cpp (revision 67697)
+++ WebCore/inspector/InspectorController.cpp (working copy)
@@ -500,6 +500,13 @@
connectedFrontendCount++;
}
+void InspectorController::reuseFrontend()
+{
+ connectFrontend();
+ restoreDebugger();
+ restoreProfiler();
+}
+
void InspectorController::show()
{
if (!enabled())
@@ -663,6 +670,13 @@
m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
m_pendingEvaluateTestCommands.clear();
+ restoreDebugger();
+ restoreProfiler();
+}
+
+void InspectorController::restoreDebugger()
+{
+ ASSERT(m_frontend);
#if ENABLE(JAVASCRIPT_DEBUGGER)
if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled())
enableDebuggerFromFrontend(false);
@@ -671,6 +685,13 @@
if (debuggerEnabled == "true" || m_attachDebuggerWhenShown)
enableDebugger();
}
+#endif
+}
+
+void InspectorController::restoreProfiler()
+{
+ ASSERT(m_frontend);
+#if ENABLE(JAVASCRIPT_DEBUGGER)
m_profilerAgent->setFrontend(m_frontend.get());
if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
String profilerEnabledSetting = setting(profilerEnabledSettingName);
@@ -1560,7 +1581,6 @@
if (m_debuggerAgent)
m_debuggerAgent->resume();
}
-// JavaScriptDebugListener functions
#endif
« no previous file with comments | « WebCore/inspector/InspectorController.h ('k') | WebKit/chromium/src/WebDevToolsAgentImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698