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

Unified Diff: Source/WebCore/inspector/InspectorRuntimeAgent.cpp

Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/inspector/InspectorRuntimeAgent.h ('k') | Source/WebCore/inspector/InstrumentingAgents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/inspector/InspectorRuntimeAgent.cpp
===================================================================
--- Source/WebCore/inspector/InspectorRuntimeAgent.cpp (revision 133600)
+++ Source/WebCore/inspector/InspectorRuntimeAgent.cpp (working copy)
@@ -37,11 +37,6 @@
#include "InjectedScript.h"
#include "InjectedScriptManager.h"
#include "InspectorValues.h"
-#include "InstrumentingAgents.h"
-#include "WorkerContext.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerRunLoop.h"
-#include "WorkerThread.h"
#include <wtf/PassRefPtr.h>
@@ -63,14 +58,11 @@
#if ENABLE(JAVASCRIPT_DEBUGGER)
, m_scriptDebugServer(0)
#endif
- , m_paused(false)
{
- m_instrumentingAgents->setInspectorRuntimeAgent(this);
}
InspectorRuntimeAgent::~InspectorRuntimeAgent()
{
- m_instrumentingAgents->setInspectorRuntimeAgent(0);
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -172,7 +164,6 @@
void InspectorRuntimeAgent::run(ErrorString*)
{
- m_paused = false;
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -180,18 +171,6 @@
{
m_scriptDebugServer = scriptDebugServer;
}
-
-#if ENABLE(WORKERS)
-void InspectorRuntimeAgent::pauseWorkerContext(WorkerContext* context)
-{
- m_paused = true;
- MessageQueueWaitResult result;
- do {
- result = context->thread()->runLoop().runInMode(context, WorkerDebuggerAgent::debuggerTaskMode);
- // Keep waiting until execution is resumed.
- } while (result == MessageQueueMessageReceived && m_paused);
-}
-#endif // ENABLE(WORKERS)
#endif // ENABLE(JAVASCRIPT_DEBUGGER)
} // namespace WebCore
« no previous file with comments | « Source/WebCore/inspector/InspectorRuntimeAgent.h ('k') | Source/WebCore/inspector/InstrumentingAgents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698