Diff
Modified: trunk/Source/WebCore/ChangeLog (90123 => 90124)
--- trunk/Source/WebCore/ChangeLog 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/ChangeLog 2011-06-30 16:05:11 UTC (rev 90124)
@@ -1,3 +1,39 @@
+2011-06-30 Patrick Gansterer <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ Remove dependnecy on IDL generation for disabled features in JSC bindings
+ https://bugs.webkit.org/show_bug.cgi?id=63718
+
+ Move the #if ENABLE() line directly after #include "config.h".
+ This enables us to compile all files even when we don't generate the IDL output.
+
+ * bindings/js/IDBBindingUtilities.cpp:
+ * bindings/js/JSConsoleCustom.cpp:
+ * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+ * bindings/js/JSCustomXPathNSResolver.cpp:
+ * bindings/js/JSDOMApplicationCacheCustom.cpp:
+ * bindings/js/JSDeviceMotionEventCustom.cpp:
+ * bindings/js/JSDeviceOrientationEventCustom.cpp:
+ * bindings/js/JSInjectedScriptHostCustom.cpp:
+ * bindings/js/JSInjectedScriptManager.cpp:
+ * bindings/js/JSInspectorFrontendHostCustom.cpp:
+ * bindings/js/JSJavaScriptCallFrameCustom.cpp:
+ * bindings/js/JSSQLResultSetRowListCustom.cpp:
+ * bindings/js/JSSQLTransactionCustom.cpp:
+ * bindings/js/JSSQLTransactionSyncCustom.cpp:
+ * bindings/js/JSSVGElementInstanceCustom.cpp:
+ * bindings/js/JSStorageCustom.cpp:
+ * bindings/js/JSTouchCustom.cpp:
+ * bindings/js/JSTouchListCustom.cpp:
+ * bindings/js/JSXPathResultCustom.cpp:
+ * bindings/js/_javascript_CallFrame.cpp:
+ * bindings/js/PageScriptDebugServer.cpp:
+ * bindings/js/ScriptDebugServer.cpp:
+ * bindings/js/ScriptGCEvent.cpp:
+ * bindings/js/ScriptProfile.cpp:
+ * bindings/js/WorkerScriptDebugServer.cpp:
+
2011-06-30 Alexander Pavlov <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "IDBBindingUtilities.h"
#if ENABLE(INDEXED_DATABASE)
+#include "IDBBindingUtilities.h"
+
#include "IDBKey.h"
namespace WebCore {
@@ -46,4 +47,4 @@
} // namespace WebCore
-#endif
+#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/bindings/js/JSConsoleCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSConsoleCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSConsoleCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -25,6 +25,8 @@
#include "config.h"
+#if ENABLE(_javascript__DEBUGGER)
+
#include "JSConsole.h"
#include "Console.h"
@@ -39,8 +41,6 @@
namespace WebCore {
-#if ENABLE(_javascript__DEBUGGER)
-
typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
JSValue JSConsole::profiles(ExecState* exec) const
@@ -77,6 +77,6 @@
return jsUndefined();
}
-#endif
+} // namespace WebCore
-} // namespace WebCore
+#endif // ENABLE(_javascript__DEBUGGER)
Modified: trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -27,10 +27,11 @@
*/
#include "config.h"
-#include "JSSQLStatementErrorCallback.h"
#if ENABLE(DATABASE)
+#include "JSSQLStatementErrorCallback.h"
+
#include "JSSQLError.h"
#include "JSSQLTransaction.h"
#include "ScriptExecutionContext.h"
Modified: trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSCustomXPathNSResolver.h"
#if ENABLE(XPATH)
+#include "JSCustomXPathNSResolver.h"
+
#include "Console.h"
#include "Document.h"
#include "ExceptionCode.h"
Modified: trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSDOMApplicationCache.h"
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#include "JSDOMApplicationCache.h"
+
#include "DOMApplicationCache.h"
#include "DOMWindow.h"
#include "Event.h"
Modified: trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSDeviceMotionEvent.h"
#if ENABLE(DEVICE_ORIENTATION)
+#include "JSDeviceMotionEvent.h"
+
#include "DeviceMotionData.h"
#include "DeviceMotionEvent.h"
Modified: trunk/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSDeviceOrientationEvent.h"
#if ENABLE(DEVICE_ORIENTATION)
+#include "JSDeviceOrientationEvent.h"
+
#include "DeviceOrientation.h"
#include "DeviceOrientationEvent.h"
Modified: trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -31,10 +31,11 @@
*/
#include "config.h"
-#include "JSInjectedScriptHost.h"
#if ENABLE(INSPECTOR)
+#include "JSInjectedScriptHost.h"
+
#if ENABLE(DATABASE)
#include "Database.h"
#include "JSDatabase.h"
Modified: trunk/Source/WebCore/bindings/js/JSInjectedScriptManager.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSInjectedScriptManager.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSInjectedScriptManager.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -31,10 +31,11 @@
*/
#include "config.h"
-#include "InjectedScriptManager.h"
#if ENABLE(INSPECTOR)
+#include "InjectedScriptManager.h"
+
#include "ExceptionCode.h"
#include "InjectedScript.h"
#include "JSDOMWindow.h"
Modified: trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -31,10 +31,11 @@
*/
#include "config.h"
-#include "JSInspectorFrontendHost.h"
#if ENABLE(INSPECTOR)
+#include "JSInspectorFrontendHost.h"
+
#include "ContextMenuItem.h"
#include "InspectorController.h"
#include "InspectorFrontendHost.h"
Modified: trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSJavaScriptCallFrame.h"
#if ENABLE(_javascript__DEBUGGER)
+#include "JSJavaScriptCallFrame.h"
+
#include "_javascript_CallFrame.h"
#include <runtime/ArrayPrototype.h>
#include <runtime/Error.h>
Modified: trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -27,10 +27,11 @@
*/
#include "config.h"
-#include "JSSQLResultSetRowList.h"
#if ENABLE(DATABASE)
+#include "JSSQLResultSetRowList.h"
+
#include "ExceptionCode.h"
#include "SQLValue.h"
#include "SQLResultSetRowList.h"
@@ -80,6 +81,6 @@
return object;
}
-}
+} // namespace WebCore
-#endif
+#endif // ENABLE(DATABASE)
Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -27,10 +27,11 @@
*/
#include "config.h"
-#include "JSSQLTransaction.h"
#if ENABLE(DATABASE)
+#include "JSSQLTransaction.h"
+
#include "DOMWindow.h"
#include "ExceptionCode.h"
#include "JSSQLStatementCallback.h"
@@ -116,6 +117,6 @@
return jsUndefined();
}
-}
+} // namespace WebCore
#endif // ENABLE(DATABASE)
Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -27,10 +27,11 @@
*/
#include "config.h"
-#include "JSSQLTransactionSync.h"
#if ENABLE(DATABASE)
+#include "JSSQLTransactionSync.h"
+
#include "ExceptionCode.h"
#include "JSSQLResultSet.h"
#include "SQLResultSet.h"
@@ -93,6 +94,6 @@
return result;
}
-}
+} // namespace WebCore
#endif // ENABLE(DATABASE)
Modified: trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -25,9 +25,11 @@
*/
#include "config.h"
+
+#if ENABLE(SVG)
+
#include "JSSVGElementInstance.h"
-#if ENABLE(SVG)
#include "JSNode.h"
#include "SVGElementInstance.h"
Modified: trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSStorageCustom.h"
#if ENABLE(DOM_STORAGE)
+#include "JSStorageCustom.h"
+
#include "PlatformString.h"
#include <runtime/PropertyNameArray.h>
#include "Storage.h"
Modified: trunk/Source/WebCore/bindings/js/JSTouchCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSTouchCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSTouchCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSTouch.h"
#if ENABLE(TOUCH_EVENTS)
+#include "JSTouch.h"
+
#include "Touch.h"
using namespace JSC;
@@ -44,4 +45,4 @@
} // namespace WebCore
-#endif
+#endif // ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebCore/bindings/js/JSTouchListCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSTouchListCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSTouchListCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSTouchList.h"
#if ENABLE(TOUCH_EVENTS)
+#include "JSTouchList.h"
+
#include "TouchList.h"
using namespace JSC;
@@ -44,4 +45,4 @@
} // namespace WebCore
-#endif
+#endif // ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,10 +24,11 @@
*/
#include "config.h"
-#include "JSXPathResult.h"
#if ENABLE(XPATH)
+#include "JSXPathResult.h"
+
#include "JSDOMBinding.h"
#include "XPathResult.h"
#include "XPathValue.h"
Modified: trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -24,12 +24,12 @@
*/
#include "config.h"
+
+#if ENABLE(_javascript__DEBUGGER) && USE(JSC)
+
#include "_javascript_CallFrame.h"
#include "JSDOMBinding.h"
-
-#if ENABLE(_javascript__DEBUGGER) && USE(JSC)
-
#include "PlatformString.h"
#include <debugger/DebuggerCallFrame.h>
#include <runtime/Completion.h>
Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -29,10 +29,11 @@
*/
#include "config.h"
-#include "PageScriptDebugServer.h"
#if ENABLE(_javascript__DEBUGGER)
+#include "PageScriptDebugServer.h"
+
#include "Frame.h"
#include "FrameView.h"
#include "JSDOMWindowCustom.h"
Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -28,10 +28,11 @@
*/
#include "config.h"
-#include "ScriptDebugServer.h"
#if ENABLE(_javascript__DEBUGGER)
+#include "ScriptDebugServer.h"
+
#include "EventLoop.h"
#include "Frame.h"
#include "JSJavaScriptCallFrame.h"
Modified: trunk/Source/WebCore/bindings/js/ScriptGCEvent.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/ScriptGCEvent.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/ScriptGCEvent.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -29,10 +29,11 @@
*/
#include "config.h"
-#include "ScriptGCEvent.h"
#if ENABLE(INSPECTOR)
+#include "ScriptGCEvent.h"
+
#include "JSDOMWindow.h"
#include <heap/Heap.h>
#include <runtime/JSGlobalData.h>
@@ -52,4 +53,4 @@
} // namespace WebCore
-#endif // !ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/bindings/js/ScriptProfile.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/ScriptProfile.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -25,9 +25,11 @@
*/
#include "config.h"
+
+#if ENABLE(_javascript__DEBUGGER)
+
#include "ScriptProfile.h"
-#if ENABLE(_javascript__DEBUGGER)
#include "InspectorValues.h"
#include "JSDOMBinding.h"
#include <profiler/Profile.h>
Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (90123 => 90124)
--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2011-06-30 15:30:52 UTC (rev 90123)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2011-06-30 16:05:11 UTC (rev 90124)
@@ -29,10 +29,11 @@
*/
#include "config.h"
-#include "WorkerScriptDebugServer.h"
#if ENABLE(_javascript__DEBUGGER) && ENABLE(WORKERS)
+#include "WorkerScriptDebugServer.h"
+
#include "WorkerContext.h"
namespace WebCore {
