Bug 124098 – Web Inspector: Split Inspector.json into individual domain json files

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Inspector

[Joseph Pecoraro]

Eventually, to put an Inspector debugger into JavaScriptCore we will need to put some of the domains (RunTime, Debugger, Profiler, ...) into JSC. So this will mean splitting up the domains between JavaScriptCore and WebCore.

[Radar WebKit Bug Importer]

<rdar://problem/15430787>

[Joseph Pecoraro]

Created attachment 216479 [details]
[PATCH] For Bots

No changelog, just checking if bots build.

[Timothy Hatcher]

Comment on attachment 216479 [details]
[PATCH] For Bots

View in context: https://bugs.webkit.org/attachment.cgi?id=216479&action=review

Looks fine.

> Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb:18
> +$inspector_json_path = Tempfile.new('generated-Inspector.json').path

Double quotes?

[Joseph Pecoraro]

Created attachment 216588 [details]
[PATCH] Proposed Fix

I guess maybe the EWS bots don't apply patches this large?

[EFL EWS Bot]

Comment on attachment 216588 [details]
[PATCH] Proposed Fix

Attachment 216588 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/22699486

[Joseph Pecoraro]

Hmm, looks like InspectorFrontend.cpp generated incorrectly.

/mnt/eflews/webkit/WebKit/WebKitBuild/Release/DerivedSources/WebCore/InspectorFrontend.cpp:22:5: error: stray '#' in program
/mnt/eflews/webkit/WebKit/WebKitBuild/Release/DerivedSources/WebCore/InspectorFrontend.cpp:1077:2: error: #endif without #if

The CMakeLists.txt changes look sane to me, but I can't really test, or see the resulting output.

Any EFL folks know what may be going wrong? Is it okay to make a dependency of one command be the output of another command, or should I just combine both commands in one?

[EFL EWS Bot]

Comment on attachment 216588 [details]
[PATCH] Proposed Fix

Attachment 216588 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/21249467

[Joseph Pecoraro]

(In reply to comment #6)
> Hmm, looks like InspectorFrontend.cpp generated incorrectly.
> 
> /mnt/eflews/webkit/WebKit/WebKitBuild/Release/DerivedSources/WebCore/InspectorFrontend.cpp:22:5: error: stray '#' in program
> /mnt/eflews/webkit/WebKit/WebKitBuild/Release/DerivedSources/WebCore/InspectorFrontend.cpp:1077:2: error: #endif without #if
> 
> The CMakeLists.txt changes look sane to me, but I can't really test, or see the resulting output.
> 
> Any EFL folks know what may be going wrong? Is it okay to make a dependency of one command be the output of another command, or should I just combine both commands in one?

With Ossy's help we tracked this down. Looks like the domains did not output sorted into the combined Inspector.json. The order mattered, because out of order an #if ENABLE ended up in a poor place. Sorting the output should fix this.

[Joseph Pecoraro]

Created attachment 216716 [details]
[PATCH] Updated for Bots

[WebKit Commit Bot]

Attachment 216716 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/.gitattributes', u'Source/WebCore/CMakeLists.txt', u'Source/WebCore/ChangeLog', u'Source/WebCore/DerivedSources.make', u'Source/WebCore/GNUmakefile.am', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/inspector/CodeGeneratorInspector.py', u'Source/WebCore/inspector/Inspector.json', u'Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py', u'Source/WebCore/inspector/protocol/ApplicationCache.json', u'Source/WebCore/inspector/protocol/CSS.json', u'Source/WebCore/inspector/protocol/Canvas.json', u'Source/WebCore/inspector/protocol/Console.json', u'Source/WebCore/inspector/protocol/DOM.json', u'Source/WebCore/inspector/protocol/DOMDebugger.json', u'Source/WebCore/inspector/protocol/DOMStorage.json', u'Source/WebCore/inspector/protocol/Database.json', u'Source/WebCore/inspector/protocol/Debugger.json', u'Source/WebCore/inspector/protocol/FileSystem.json', u'Source/WebCore/inspector/protocol/HeapProfiler.json', u'Source/WebCore/inspector/protocol/IndexedDB.json', u'Source/WebCore/inspector/protocol/Input.json', u'Source/WebCore/inspector/protocol/InspectorDomain.json', u'Source/WebCore/inspector/protocol/LayerTree.json', u'Source/WebCore/inspector/protocol/Memory.json', u'Source/WebCore/inspector/protocol/Network.json', u'Source/WebCore/inspector/protocol/Page.json', u'Source/WebCore/inspector/protocol/Profiler.json', u'Source/WebCore/inspector/protocol/Runtime.json', u'Source/WebCore/inspector/protocol/Timeline.json', u'Source/WebCore/inspector/protocol/Worker.json', u'Source/WebInspectorUI/ChangeLog', u'Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb', u'Source/WebInspectorUI/UserInterface/ApplicationCacheObserver.js', u'Source/WebInspectorUI/UserInterface/CSSObserver.js', u'Source/WebInspectorUI/UserInterface/CanvasObserver.js', u'Source/WebInspectorUI/UserInterface/ConsoleObserver.js', u'Source/WebInspectorUI/UserInterface/DOMObserver.js', u'Source/WebInspectorUI/UserInterface/DOMStorageObserver.js', u'Source/WebInspectorUI/UserInterface/DatabaseObserver.js', u'Source/WebInspectorUI/UserInterface/DebuggerObserver.js', u'Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js', u'Source/WebInspectorUI/UserInterface/InspectorObserver.js', u'Source/WebInspectorUI/UserInterface/LayerTreeObserver.js', u'Source/WebInspectorUI/UserInterface/NetworkObserver.js', u'Source/WebInspectorUI/UserInterface/PageObserver.js', u'Source/WebInspectorUI/UserInterface/ProfilerObserver.js', u'Source/WebInspectorUI/UserInterface/Resource.js', u'Source/WebInspectorUI/UserInterface/RuntimeObserver.js', u'Source/WebInspectorUI/UserInterface/TimelineObserver.js']" exit_code: 1
Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py:43:  multiple statements on one line (semicolon)  [pep8/E702] [5]
Total errors found: 1 in 47 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Joseph Pecoraro]

Committed <http://trac.webkit.org/changeset/159233>.