Diff
Modified: trunk/Source/WebCore/ChangeLog (97448 => 97449)
--- trunk/Source/WebCore/ChangeLog 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/ChangeLog 2011-10-14 08:12:59 UTC (rev 97449)
@@ -1,3 +1,20 @@
+2011-10-14 Rémi Duraffort <[email protected]>
+
+ Fix compilation when the JS Debugger is disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=70007
+
+ Reviewed by Antti Koivisto.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
+ * inspector/InspectorRuntimeAgent.cpp:
+ * inspector/InspectorRuntimeAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ * inspector/WorkerInspectorController.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+ (WebCore::WorkerMessagingProxy::sendMessageToInspector):
+
2011-10-13 Nikolas Zimmermann <[email protected]>
Prepare SVGImage intrinsic size negotiation: Introduce an IntSize <-> SVGImage cache in CachedImage
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (97448 => 97449)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-10-14 08:12:59 UTC (rev 97449)
@@ -809,8 +809,10 @@
InstrumentingAgents* instrumentingAgents = instrumentationForWorkerContext(workerContext);
if (!instrumentingAgents)
return;
+#if ENABLE(_javascript__DEBUGGER)
if (InspectorRuntimeAgent* runtimeAgent = instrumentingAgents->inspectorRuntimeAgent())
runtimeAgent->pauseWorkerContext(workerContext);
+#endif
}
void InspectorInstrumentation::workerContextTerminatedImpl(InstrumentingAgents* instrumentingAgents, WorkerContextProxy* proxy)
Modified: trunk/Source/WebCore/inspector/InspectorRuntimeAgent.cpp (97448 => 97449)
--- trunk/Source/WebCore/inspector/InspectorRuntimeAgent.cpp 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/inspector/InspectorRuntimeAgent.cpp 2011-10-14 08:12:59 UTC (rev 97449)
@@ -145,7 +145,6 @@
{
m_scriptDebugServer = scriptDebugServer;
}
-#endif
#if ENABLE(WORKERS)
void InspectorRuntimeAgent::pauseWorkerContext(WorkerContext* context)
@@ -162,7 +161,8 @@
{
m_paused = false;
}
-#endif
+#endif // ENABLE(WORKERS)
+#endif // ENABLE(_javascript__DEBUGGER)
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h (97448 => 97449)
--- trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h 2011-10-14 08:12:59 UTC (rev 97449)
@@ -78,11 +78,11 @@
#if ENABLE(_javascript__DEBUGGER)
void setScriptDebugServer(ScriptDebugServer*);
-#endif
#if ENABLE(WORKERS)
void pauseWorkerContext(WorkerContext*);
void resume();
#endif
+#endif
protected:
InspectorRuntimeAgent(InstrumentingAgents*, InjectedScriptManager*);
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (97448 => 97449)
--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2011-10-14 08:12:59 UTC (rev 97449)
@@ -210,10 +210,12 @@
m_backendDispatcher->dispatch(message);
}
+#if ENABLE(_javascript__DEBUGGER)
void WorkerInspectorController::resume()
{
m_runtimeAgent->resume();
}
+#endif
}
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (97448 => 97449)
--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2011-10-14 08:12:59 UTC (rev 97449)
@@ -66,7 +66,9 @@
void disconnectFrontend();
void restoreInspectorStateFromCookie(const String& inspectorCookie);
void dispatchMessageFromFrontend(const String&);
+#if ENABLE(_javascript__DEBUGGER)
void resume();
+#endif
private:
friend InstrumentingAgents* instrumentationForWorkerContext(WorkerContext*);
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (97448 => 97449)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2011-10-14 08:08:51 UTC (rev 97448)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2011-10-14 08:12:59 UTC (rev 97449)
@@ -380,7 +380,9 @@
m_pageInspector = 0;
if (m_askedToTerminate)
return;
+#if ENABLE(_javascript__DEBUGGER)
m_workerThread->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerContextInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
+#endif
}
static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
@@ -393,7 +395,9 @@
{
if (m_askedToTerminate)
return;
+#if ENABLE(_javascript__DEBUGGER)
m_workerThread->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerDebuggerAgent::debuggerTaskMode);
+#endif
}
#endif
