Changeset 172688 in webkit


Ignore:
Timestamp:
Aug 15, 2014 10:49:19 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: Update Scripts/update-LegacyInspectorBackendCommands.rb for the new generator
​https://bugs.webkit.org/show_bug.cgi?id=136006

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-08-15
Reviewed by Timothy Hatcher.

  • Scripts/update-LegacyInspectorBackendCommands.rb:

Use the new generator and pass the appropriate flags.

  • UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js:
  • UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js:

Newly generated files using the new generator.

  • Versions/Inspector-iOS-6.0.json:

Remove unsupported features.

Location:
trunk/Source/WebInspectorUI
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r172682 r172688  
     12014-08-15  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Update Scripts/update-LegacyInspectorBackendCommands.rb for the new generator
     4        https://bugs.webkit.org/show_bug.cgi?id=136006
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        * Scripts/update-LegacyInspectorBackendCommands.rb:
     9        Use the new generator and pass the appropriate flags.
     10
     11        * UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js:
     12        * UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js:
     13        Newly generated files using the new generator.
     14
     15        * Versions/Inspector-iOS-6.0.json:
     16        Remove unsupported features.
     17
    1182014-08-15  Joseph Pecoraro  <pecoraro@apple.com>
    219

  • trunk/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb

    r165838 r172688  
    1212JAVASCRIPTCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "JavaScriptCore")
    1313
    14 $code_generator_path = File.join JAVASCRIPTCORE_PATH, "inspector", "scripts", "CodeGeneratorInspector.py"
     14$code_generator_path = File.join JAVASCRIPTCORE_PATH, "inspector", "scripts", "generate-inspector-protocol-bindings.py"
    1515$versions_directory_path = File.join WEB_INSPECTOR_PATH, "Versions"
    1616$web_inspector_protocol_legacy_path = File.join WEB_INSPECTOR_PATH, "UserInterface", "Protocol", "Legacy"
    … …  
    2626  def run
    2727    output_filename_prefix = {"JavaScript" => "JS", "Web" => "Web"}[@type]
     28    framework = {"JavaScript" => "JavaScriptCore", "Web" => "WebCore"}[@type]
    2829    output_filename = "Inspector#{output_filename_prefix}BackendCommands.js"
    2930    display_input = File.basename @input_json_path
    … …  
    3334    Dir.mktmpdir do |tmpdir|
    3435      dependency = @dependency_json_path ? "'#{@dependency_json_path}'" : ""
    35       cmd = "#{$code_generator_path} '#{@input_json_path}' #{dependency} --no_verification --output_h_dir '#{tmpdir}' --output_cpp_dir '#{tmpdir}' --output_js_dir '#{tmpdir}' --write_always --output_type '#{@type}'"
     36      cmd = "#{$code_generator_path} --force --outputDir '#{tmpdir}' --framework #{framework} '#{@input_json_path}' #{dependency}"
    3637      %x{ #{cmd} }
    3738      if $?.exitstatus != 0

  • trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js

    r166846 r172688  
    1 // File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
    2 
    3 // Copyright (c) 2013 Apple Inc. All Rights Reserved.
    4 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
    5 // Use of this source code is governed by a BSD-style license that can be
    6 // found in the LICENSE file.
    7 
     1/*
     2 * Copyright (C) 2013 Google Inc. All rights reserved.
     3 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     4 * Copyright (C) 2014 University of Washington. All rights reserved.
     5 *
     6 * Redistribution and use in source and binary forms, with or without
     7 * modification, are permitted provided that the following conditions
     8 * are met:
     9 * 1. Redistributions of source code must retain the above copyright
     10 *    notice, this list of conditions and the following disclaimer.
     11 * 2. Redistributions in binary form must reproduce the above copyright
     12 *    notice, this list of conditions and the following disclaimer in the
     13 *    documentation and/or other materials provided with the distribution.
     14 *
     15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     17 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     19 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     25 * THE POSSIBILITY OF SUCH DAMAGE.
     26 */
     27
     28// DO NOT EDIT THIS FILE. It is automatically generated from Inspector-iOS-6.0.json
     29// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    830
    931// Inspector.
    … …  
    4163
    4264// Runtime.
    43 InspectorBackend.registerRuntimeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Runtime");
    4465InspectorBackend.registerEnum("Runtime.RemoteObjectType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
    4566InspectorBackend.registerEnum("Runtime.RemoteObjectSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
    … …  
    5374// Console.
    5475InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
    55 InspectorBackend.registerEnum("Console.ConsoleMessageSource", {HTML: "html", WML: "wml", XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Other: "other"});
     76InspectorBackend.registerEnum("Console.ConsoleMessageSource", {HTML: "html", XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Other: "other"});
    5677InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Tip: "tip", Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
    5778InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Trace: "trace", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert"});

  • trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js

    r168678 r172688  
    1 // File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
    2 
    3 // Copyright (c) 2013 Apple Inc. All Rights Reserved.
    4 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
    5 // Use of this source code is governed by a BSD-style license that can be
    6 // found in the LICENSE file.
    7 
     1/*
     2 * Copyright (C) 2013 Google Inc. All rights reserved.
     3 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     4 * Copyright (C) 2014 University of Washington. All rights reserved.
     5 *
     6 * Redistribution and use in source and binary forms, with or without
     7 * modification, are permitted provided that the following conditions
     8 * are met:
     9 * 1. Redistributions of source code must retain the above copyright
     10 *    notice, this list of conditions and the following disclaimer.
     11 * 2. Redistributions in binary form must reproduce the above copyright
     12 *    notice, this list of conditions and the following disclaimer in the
     13 *    documentation and/or other materials provided with the distribution.
     14 *
     15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     17 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     19 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     25 * THE POSSIBILITY OF SUCH DAMAGE.
     26 */
     27
     28// DO NOT EDIT THIS FILE. It is automatically generated from Inspector-iOS-7.0.json
     29// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    830
    931// Inspector.

  • trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json

    r172655 r172688  
    408408                "description": "Console message.",
    409409                "properties": [
    410                     { "name": "source", "type": "string", "enum": ["html", "wml", "xml", "javascript", "network", "console-api", "other"], "description": "Message source." },
     410                    { "name": "source", "type": "string", "enum": ["html", "xml", "javascript", "network", "console-api", "other"], "description": "Message source." },
    411411                    { "name": "level", "type": "string", "enum": ["tip", "log", "warning", "error", "debug"], "description": "Message severity." },
    412412                    { "name": "text", "type": "string", "description": "Message text." },
    … …  
    18231823                "id": "EventType",
    18241824                "type": "string",
    1825                 "enum": ["EventDispatch", "Layout", "RecalculateStyles", "Paint", "BeginFrame", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame"],
     1825                "enum": ["EventDispatch", "Layout", "RecalculateStyles", "Paint", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame"],
    18261826                "description": "Timeline record type."
    18271827            },
    … …  
    18481848                "name": "stop",
    18491849                "description": "Stops capturing instrumentation events."
    1850             },
    1851             {
    1852                 "name": "setIncludeMemoryDetails",
    1853                 "parameters": [
    1854                     { "name": "enabled", "type": "boolean", "description": "True to start collecting DOM counters." }
    1855                 ],
    1856                 "description": "Starts calculating various DOM statistics and sending them as part of timeline events."
    18571850            }
    18581851        ],
Note: See TracChangeset for help on using the changeset viewer.