This is the last unforking patch for InspectorController, I promise. It's fugly, but it gets the job done. Basically, in order to allow current Debuggerless and Profilerless Chromium Inspector to compile from ToT, I am extending ENABLE_JAVASCRIPT_DEBUGGER guard to all profiler methods and to IDL. As a side-effect, I had to change the world to make IDL recognize the guard correctly across platforms. I wracked my brain trying to come up with a simpler solution, but this is the best I could come up with. I suck. I consider this change temporary until the big InspectorController redesign starts.
Created attachment 29898 [details] Extend the cover of ENABLE_JAVASCRIPT_DEBUGGER to profiler, v1 JavaScriptCore/ChangeLog | 9 + .../Configurations/FeatureDefines.xcconfig | 3 +- WebCore/ChangeLog | 18 ++ WebCore/Configurations/FeatureDefines.xcconfig | 3 +- WebCore/WebCore.vcproj/build-generated-files.sh | 2 +- WebCore/bindings/js/JSConsoleCustom.cpp | 4 + WebCore/bindings/js/JSDOMWindowBase.cpp | 5 +- .../bindings/js/JSInspectorControllerCustom.cpp | 28 +- WebCore/inspector/InspectorController.cpp | 324 ++++++++++---------- WebCore/inspector/InspectorController.h | 82 +++--- WebCore/inspector/InspectorController.idl | 32 +- WebCore/page/Console.cpp | 2 +- WebKit/mac/ChangeLog | 9 + WebKit/mac/Configurations/FeatureDefines.xcconfig | 3 +- WebKitTools/ChangeLog | 9 + WebKitTools/Scripts/build-webkit | 5 + 16 files changed, 299 insertions(+), 239 deletions(-)
Why not add ENABLE_JAVASCRIPT_PROFILER?
Basically, two reasons: * They are not mutually exclusive (i.e. you can't really pick one and not the other). There could be some work done to make that happen, which leads us to ... * I consider this a temporary change with minimal effect possible, to unfork and clear way for Inspector rework. I considered renaming JAVASCRIPT_DEBUGGER to be more accurate, like JAVASCRIPT_INSPECTOR, JAVASCRIPT_DEVELOPER_TOOLS or something, but couldn't come up with a name that didn't seem vague. Perhaps that's the route I should with?
Landed as http://trac.webkit.org/changeset/43072.
GTK fix landed as http://trac.webkit.org/changeset/43074.