Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (172687 => 172688)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-16 04:38:00 UTC (rev 172687)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-16 05:49:19 UTC (rev 172688)
@@ -1,5 +1,22 @@
2014-08-15 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: Update Scripts/update-LegacyInspectorBackendCommands.rb for the new generator
+ https://bugs.webkit.org/show_bug.cgi?id=136006
+
+ 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.
+
+2014-08-15 Joseph Pecoraro <pecor...@apple.com>
+
Web Inspector: Remove forced layouts during recording caused by striped background element resizing
https://bugs.webkit.org/show_bug.cgi?id=136009
Modified: trunk/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb (172687 => 172688)
--- trunk/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb 2014-08-16 04:38:00 UTC (rev 172687)
+++ trunk/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb 2014-08-16 05:49:19 UTC (rev 172688)
@@ -11,7 +11,7 @@
WEB_INSPECTOR_PATH = File.expand_path File.join(File.dirname(__FILE__), "..")
_javascript_CORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "_javascript_Core")
-$code_generator_path = File.join _javascript_CORE_PATH, "inspector", "scripts", "CodeGeneratorInspector.py"
+$code_generator_path = File.join _javascript_CORE_PATH, "inspector", "scripts", "generate-inspector-protocol-bindings.py"
$versions_directory_path = File.join WEB_INSPECTOR_PATH, "Versions"
$web_inspector_protocol_legacy_path = File.join WEB_INSPECTOR_PATH, "UserInterface", "Protocol", "Legacy"
@@ -25,6 +25,7 @@
def run
output_filename_prefix = {"_javascript_" => "JS", "Web" => "Web"}[@type]
+ framework = {"_javascript_" => "_javascript_Core", "Web" => "WebCore"}[@type]
output_filename = "Inspector#{output_filename_prefix}BackendCommands.js"
display_input = File.basename @input_json_path
display_output = File.join @output_directory_path.gsub(/^.*?\/UserInterface/, "UserInterface"), output_filename
@@ -32,7 +33,7 @@
Dir.mktmpdir do |tmpdir|
dependency = @dependency_json_path ? "'#{@dependency_json_path}'" : ""
- 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}'"
+ cmd = "#{$code_generator_path} --force --outputDir '#{tmpdir}' --framework #{framework} '#{@input_json_path}' #{dependency}"
%x{ #{cmd} }
if $?.exitstatus != 0
puts "ERROR: Error Code (#{$?.exitstatus}) Evaluating: #{cmd}"
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js (172687 => 172688)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js 2014-08-16 04:38:00 UTC (rev 172687)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js 2014-08-16 05:49:19 UTC (rev 172688)
@@ -1,11 +1,33 @@
-// File is generated by _javascript_Core/inspector/scripts/CodeGeneratorInspector.py
+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 University of Washington. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
-// Copyright (c) 2013 Apple Inc. All Rights Reserved.
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// DO NOT EDIT THIS FILE. It is automatically generated from Inspector-iOS-6.0.json
+// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-
// Inspector.
InspectorBackend.registerInspectorDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Inspector");
InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["testCallId", "script"]);
@@ -40,7 +62,6 @@
InspectorBackend.registerCommand("Page.setScriptExecutionDisabled", [{"name": "value", "type": "boolean", "optional": false}], []);
// Runtime.
-InspectorBackend.registerRuntimeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Runtime");
InspectorBackend.registerEnum("Runtime.RemoteObjectType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
InspectorBackend.registerEnum("Runtime.RemoteObjectSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
InspectorBackend.registerCommand("Runtime.evaluate", [{"name": "_expression_", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "frameId", "type": "string", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
@@ -52,7 +73,7 @@
// Console.
InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
-InspectorBackend.registerEnum("Console.ConsoleMessageSource", {HTML: "html", WML: "wml", XML: "xml", _javascript_: "_javascript_", Network: "network", ConsoleAPI: "console-api", Other: "other"});
+InspectorBackend.registerEnum("Console.ConsoleMessageSource", {HTML: "html", XML: "xml", _javascript_: "_javascript_", Network: "network", ConsoleAPI: "console-api", Other: "other"});
InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Tip: "tip", Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Trace: "trace", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert"});
InspectorBackend.registerEvent("Console.messageAdded", ["message"]);
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js (172687 => 172688)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js 2014-08-16 04:38:00 UTC (rev 172687)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js 2014-08-16 05:49:19 UTC (rev 172688)
@@ -1,11 +1,33 @@
-// File is generated by _javascript_Core/inspector/scripts/CodeGeneratorInspector.py
+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 University of Washington. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
-// Copyright (c) 2013 Apple Inc. All Rights Reserved.
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// DO NOT EDIT THIS FILE. It is automatically generated from Inspector-iOS-7.0.json
+// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-
// Inspector.
InspectorBackend.registerInspectorDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Inspector");
InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["testCallId", "script"]);
Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json (172687 => 172688)
--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-08-16 04:38:00 UTC (rev 172687)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-08-16 05:49:19 UTC (rev 172688)
@@ -407,7 +407,7 @@
"type": "object",
"description": "Console message.",
"properties": [
- { "name": "source", "type": "string", "enum": ["html", "wml", "xml", "_javascript_", "network", "console-api", "other"], "description": "Message source." },
+ { "name": "source", "type": "string", "enum": ["html", "xml", "_javascript_", "network", "console-api", "other"], "description": "Message source." },
{ "name": "level", "type": "string", "enum": ["tip", "log", "warning", "error", "debug"], "description": "Message severity." },
{ "name": "text", "type": "string", "description": "Message text." },
{ "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "trace", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "description": "Console message type." },
@@ -1822,7 +1822,7 @@
{
"id": "EventType",
"type": "string",
- "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"],
+ "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"],
"description": "Timeline record type."
},
{
@@ -1847,13 +1847,6 @@
{
"name": "stop",
"description": "Stops capturing instrumentation events."
- },
- {
- "name": "setIncludeMemoryDetails",
- "parameters": [
- { "name": "enabled", "type": "boolean", "description": "True to start collecting DOM counters." }
- ],
- "description": "Starts calculating various DOM statistics and sending them as part of timeline events."
}
],
"events": [
