Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163776 => 163777)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-10 11:41:11 UTC (rev 163777)
@@ -1,3 +1,16 @@
+2014-02-10 Peter Molnar <pmolnar.u-sze...@partner.samsung.com>
+
+ Fix EFL build with INSPECTOR disabled
+ https://bugs.webkit.org/show_bug.cgi?id=125064
+
+ Reviewed by Csaba Osztrogonác.
+
+ * inspector/InjectedScriptManager.h:
+ * inspector/ScriptDebugServer.cpp:
+ * inspector/agents/InspectorAgent.h:
+ * inspector/scripts/CodeGeneratorInspectorStrings.py:
+ (Inspector):
+
2014-02-09 Filip Pizlo <fpi...@apple.com>
GC blocks on FTL and then badness
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptManager.h (163776 => 163777)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptManager.h 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptManager.h 2014-02-10 11:41:11 UTC (rev 163777)
@@ -30,6 +30,8 @@
#ifndef InjectedScriptManager_h
#define InjectedScriptManager_h
+#if ENABLE(INSPECTOR)
+
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
#include "InspectorEnvironment.h"
@@ -82,4 +84,6 @@
} // namespace Inspector
+#endif // ENABLE(INSPECTOR)
+
#endif // !defined(InjectedScriptManager_h)
Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp (163776 => 163777)
--- trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp 2014-02-10 11:41:11 UTC (rev 163777)
@@ -31,6 +31,8 @@
#include "config.h"
#include "ScriptDebugServer.h"
+#if ENABLE(INSPECTOR)
+
#include "DebuggerCallFrame.h"
#include "JSJavaScriptCallFrame.h"
#include "JSLock.h"
@@ -336,3 +338,5 @@
}
} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h (163776 => 163777)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h 2014-02-10 11:41:11 UTC (rev 163777)
@@ -30,6 +30,8 @@
#ifndef InspectorAgent_h
#define InspectorAgent_h
+#if ENABLE(INSPECTOR)
+
#include "InspectorJSBackendDispatchers.h"
#include "InspectorJSFrontendDispatchers.h"
#include "inspector/InspectorAgentBase.h"
@@ -41,6 +43,8 @@
class InspectorObject;
class InstrumentingAgents;
+class InspectorInspectorBackendDispatcher;
+class InspectorInspectorFrontendDispatchers;
typedef String ErrorString;
@@ -69,4 +73,6 @@
} // namespace Inspector
+#endif // ENABLE(INSPECTOR)
+
#endif // !defined(InspectorAgent_h)
Modified: trunk/Source/_javascript_Core/inspector/scripts/CodeGeneratorInspectorStrings.py (163776 => 163777)
--- trunk/Source/_javascript_Core/inspector/scripts/CodeGeneratorInspectorStrings.py 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/_javascript_Core/inspector/scripts/CodeGeneratorInspectorStrings.py 2014-02-10 11:41:11 UTC (rev 163777)
@@ -148,6 +148,8 @@
"""#ifndef Inspector${outputFileNamePrefix}BackendDispatchers_h
#define Inspector${outputFileNamePrefix}BackendDispatchers_h
+#if ENABLE(INSPECTOR)
+
#include "Inspector${outputFileNamePrefix}TypeBuilders.h"
#include <inspector/InspectorBackendDispatcher.h>
#include <wtf/PassRefPtr.h>
@@ -162,16 +164,19 @@
${dispatcherInterfaces}
} // namespace Inspector
+#endif // ENABLE(INSPECTOR)
+
#endif // !defined(Inspector${outputFileNamePrefix}BackendDispatchers_h)
""")
backend_cpp = (
"""
#include "config.h"
-#include "Inspector${outputFileNamePrefix}BackendDispatchers.h"
#if ENABLE(INSPECTOR)
+#include "Inspector${outputFileNamePrefix}BackendDispatchers.h"
+
#include <inspector/InspectorFrontendChannel.h>
#include <inspector/InspectorValues.h>
#include <wtf/text/CString.h>
@@ -191,10 +196,11 @@
"""
#include "config.h"
-#include "Inspector${outputFileNamePrefix}FrontendDispatchers.h"
#if ENABLE(INSPECTOR)
+#include "Inspector${outputFileNamePrefix}FrontendDispatchers.h"
+
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/ChangeLog (163776 => 163777)
--- trunk/Source/WebCore/ChangeLog 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 11:41:11 UTC (rev 163777)
@@ -1,3 +1,16 @@
+2014-02-10 Peter Molnar <pmolnar.u-sze...@partner.samsung.com>
+
+ Fix EFL build with INSPECTOR disabled
+ https://bugs.webkit.org/show_bug.cgi?id=125064
+
+ Reviewed by Csaba Osztrogonác.
+
+ * bindings/js/PageScriptDebugServer.cpp:
+ * bindings/js/PageScriptDebugServer.h:
+ * bindings/js/WorkerScriptDebugServer.cpp:
+ * bindings/js/WorkerScriptDebugServer.h:
+ * inspector/PageInjectedScriptManager.h:
+
2014-02-10 Zan Dobersek <zdober...@igalia.com>
Fix a few mistakes that landed with r163749.
Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (163776 => 163777)
--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-02-10 11:41:11 UTC (rev 163777)
@@ -32,6 +32,8 @@
#include "config.h"
#include "PageScriptDebugServer.h"
+#if ENABLE(INSPECTOR)
+
#include "Document.h"
#include "EventLoop.h"
#include "FrameView.h"
@@ -271,3 +273,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h (163776 => 163777)
--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-02-10 11:41:11 UTC (rev 163777)
@@ -31,6 +31,8 @@
#ifndef PageScriptDebugServer_h
#define PageScriptDebugServer_h
+#if ENABLE(INSPECTOR)
+
#include <inspector/ScriptDebugServer.h>
#include <wtf/Forward.h>
@@ -79,4 +81,6 @@
} // namespace WebCore
+#endif // ENABLE(INSPECTOR)
+
#endif // PageScriptDebugServer_h
Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (163776 => 163777)
--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-02-10 11:41:11 UTC (rev 163777)
@@ -32,6 +32,8 @@
#include "config.h"
#include "WorkerScriptDebugServer.h"
+#if ENABLE(INSPECTOR)
+
#include "JSDOMBinding.h"
#include "Timer.h"
#include "WorkerDebuggerAgent.h"
@@ -109,3 +111,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (163776 => 163777)
--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-02-10 11:41:11 UTC (rev 163777)
@@ -31,6 +31,8 @@
#ifndef WorkerScriptDebugServer_h
#define WorkerScriptDebugServer_h
+#if ENABLE(INSPECTOR)
+
#include <inspector/ScriptDebugServer.h>
namespace WebCore {
@@ -65,4 +67,6 @@
} // namespace WebCore
+#endif // ENABLE(INSPECTOR)
+
#endif // WorkerScriptDebugServer_h
Modified: trunk/Source/WebCore/inspector/PageInjectedScriptManager.h (163776 => 163777)
--- trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-10 11:25:39 UTC (rev 163776)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-10 11:41:11 UTC (rev 163777)
@@ -26,6 +26,8 @@
#ifndef PageInjectedScriptManager_h
#define PageInjectedScriptManager_h
+#if ENABLE(INSPECTOR)
+
#include "CommandLineAPIHost.h"
#include <inspector/InjectedScriptManager.h>
#include <wtf/RefPtr.h>
@@ -55,4 +57,6 @@
} // namespace WebCore
+#endif // ENABLE(INSPECTOR)
+
#endif // !defined(PageInjectedScriptManager_h)
