Roll third_party/inspector_protocol to 4d389ba

This roll includes:
  - [inspector_protocol] first class citizien .pdl support

+ migrated cros_protocol.json to .pdl

TBR=dgozman@chromium.org,dpranke@chromium.org,pfeldman@chromium.org
NOPRESUBMIT=true
Bug:none

Change-Id: I0fff1582bd41115e2aa348008c7a5d48f5c59a7e
Reviewed-on: https://chromium-review.googlesource.com/1014468
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#551382}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a42a629f67ac9aae0aaa8fbd912c654559c5d880
This commit is contained in:
Alexey Kozyatinskiy
2018-04-17 17:49:38 +00:00
committed by Commit Bot
parent 0f7f85b790
commit a8011e0817
4 changed files with 20 additions and 10 deletions
+3 -2
View File
@@ -1279,8 +1279,9 @@ group("devtools_closure_compile") {
"//testing/scripts/common.py",
"//testing/scripts/run_devtools_check.py",
"//testing/xvfb.py",
"//third_party/blink/renderer/core/inspector/browser_protocol.json",
"//v8/src/inspector/js_protocol.json",
"//third_party/blink/renderer/core/inspector/browser_protocol.pdl",
"//third_party/inspector_protocol/pdl.py",
"//v8/src/inspector/js_protocol.pdl",
]
}
+4 -4
View File
@@ -1,12 +1,12 @@
The protocol.json has split into separate files. https://crbug.com/580337
One for the browser, one for a V8 javascript environment:
src/third_party/blink/renderer/core/inspector/browser_protocol.json
src/v8/src/inspector/js_protocol.json
src/third_party/blink/renderer/core/inspector/browser_protocol.pdl
src/v8/src/inspector/js_protocol.pdl
Browsable here:
https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/core/inspector/browser_protocol.json
https://chromium.googlesource.com/v8/v8/+/master/src/inspector/js_protocol.json
https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/core/inspector/browser_protocol.pdl
https://chromium.googlesource.com/v8/v8/+/master/src/inspector/js_protocol.pdl
More details on the protocol:
https://developer.chrome.com/devtools/docs/debugger-protocol
+11 -2
View File
@@ -28,12 +28,21 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
import os.path as path
import re
import sys
try:
import json
except ImportError:
import simplejson as json
sys.path.append(
path.normpath(
path.join(
path.dirname(path.abspath(__file__)),
os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, 'inspector_protocol')))
import pdl # pylint: disable=F0401
type_traits = {
"any": "*",
"string": "string",
@@ -97,8 +106,8 @@ def param_name(param):
def load_schema(file, domains):
input_file = open(file, "r")
json_string = input_file.read()
parsed_json = json.loads(json_string)
parsed_json = pdl.loads(input_file.read(), file)
input_file.close()
domains.extend(parsed_json["domains"])
+2 -2
View File
@@ -334,8 +334,8 @@ def main():
protocol_externs_file = args.protocol_externs_file
else:
generate_protocol_externs.generate_protocol_externs(protocol_externs_file,
path.join(inspector_path, 'browser_protocol.json'),
path.join(v8_inspector_path, 'js_protocol.json'))
path.join(inspector_path, 'browser_protocol.pdl'),
path.join(v8_inspector_path, 'js_protocol.pdl'))
loader = modular_build.DescriptorLoader(devtools_frontend_path)
descriptors = loader.load_applications(application_descriptors)
modules_by_name = descriptors.modules