[inspector] use own version of third_party/inspector_protocol
When Chromium and V8 use the same version of inspector_protocol, any protocol change takes at least 4 patches and 3 waiting for rolls. To simplify this process we need to have two diffrent versions of inspector_protocol in Chromium and V8. Current state of inspector_protocol was extracted into separate repository [1]. This CL puts last version of inspector_protocol into third_party/inspector_protocol. [1] https://chromium.googlesource.com/deps/inspector_protocol/ V8 CL: https://codereview.chromium.org/2447323002/ BUG=chromium:637032 R=dgozman@chromium.org Review-Url: https://codereview.chromium.org/2452853002 Cr-Commit-Position: refs/heads/master@{#428605}
This commit is contained in:
.gitignore
components/ui_devtools
third_party
WebKit
Source
inspector_protocol
CheckProtocolCompatibility.pyCodeGenerator.pyConcatenateProtocols.pyLICENSEOWNERSREADME.chromiuminspector_protocol.gniinspector_protocol.gypi
lib
Allocator_h.templateArray_h.templateBackendCallback_h.templateCollections_h.templateDispatcherBase_cpp.templateDispatcherBase_h.templateErrorSupport_cpp.templateErrorSupport_h.templateForward_h.templateFrontendChannel_h.templateMaybe_h.templateObject_cpp.templateObject_h.templateParser_cpp.templateParser_h.templateProtocol_cpp.templateValueConversions_h.templateValues_cpp.templateValues_h.template
templates
1
.gitignore
vendored
1
.gitignore
vendored
@ -361,6 +361,7 @@ vs-chromium-project.txt
|
||||
/third_party/icu
|
||||
/third_party/icu4j/lib/*.jar
|
||||
/third_party/intellij/lib/*.jar
|
||||
/third_party/inspector_protocol
|
||||
/third_party/jarjar
|
||||
/third_party/javax_inject/lib/*.jar
|
||||
/third_party/jsoncpp/source
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
_inspector_protocol = "//third_party/WebKit/Source/platform/inspector_protocol"
|
||||
_inspector_protocol = "//third_party/inspector_protocol"
|
||||
import("$_inspector_protocol/inspector_protocol.gni")
|
||||
|
||||
_protocol_generated = [
|
||||
@ -33,6 +33,7 @@ action("protocol_compatibility") {
|
||||
}
|
||||
|
||||
inspector_protocol_generate("protocol_generated_sources") {
|
||||
inspector_protocol_dir = _inspector_protocol
|
||||
visibility = [ ":*" ] # Only targets in this file can depend on this.
|
||||
|
||||
deps = [
|
||||
|
@ -4,10 +4,11 @@
|
||||
|
||||
import("//third_party/WebKit/Source/bindings/bindings.gni")
|
||||
import("//third_party/WebKit/Source/core/core.gni")
|
||||
import(
|
||||
"//third_party/WebKit/Source/platform/inspector_protocol/inspector_protocol.gni")
|
||||
import("//third_party/inspector_protocol/inspector_protocol.gni")
|
||||
import("//v8/gni/v8.gni")
|
||||
|
||||
_inspector_protocol_dir = "//third_party/inspector_protocol"
|
||||
|
||||
blink_core_sources("inspector") {
|
||||
sources = [
|
||||
"ConsoleMessage.cpp",
|
||||
@ -123,6 +124,7 @@ action("instrumentation_sources") {
|
||||
# inspector protocol -----------------------------------------------------------
|
||||
|
||||
inspector_protocol_generate("protocol_sources") {
|
||||
inspector_protocol_dir = _inspector_protocol_dir
|
||||
out_dir = blink_core_output_dir
|
||||
|
||||
config_file = "inspector_protocol_config.json"
|
||||
@ -227,7 +229,7 @@ source_set("generated") {
|
||||
}
|
||||
|
||||
action("protocol_compatibility_check") {
|
||||
script = "../../platform/inspector_protocol/CheckProtocolCompatibility.py"
|
||||
script = _inspector_protocol_dir + "/CheckProtocolCompatibility.py"
|
||||
|
||||
inputs = [
|
||||
"browser_protocol.json",
|
||||
@ -250,7 +252,7 @@ action("protocol_version") {
|
||||
deps = [
|
||||
":protocol_compatibility_check",
|
||||
]
|
||||
script = "../../platform/inspector_protocol/ConcatenateProtocols.py"
|
||||
script = _inspector_protocol_dir + "/ConcatenateProtocols.py"
|
||||
|
||||
inputs = [
|
||||
"browser_protocol.json",
|
||||
|
@ -1,39 +0,0 @@
|
||||
{
|
||||
"protocol": {
|
||||
"path": "./relative/path/protocol/sample_protocol.json",
|
||||
"package": "include/generated/files/like/this",
|
||||
"output": "place/generated/files/here",
|
||||
"namespace": ["sample_project", "protocol"],
|
||||
"export_macro": "LIB_EXPORT",
|
||||
"export_header": "lib/lib_export.h"
|
||||
},
|
||||
|
||||
"exported": {
|
||||
"package": "include/exported/files/like/this",
|
||||
"output": "place/exported/files/here",
|
||||
"string_header": "include/exported/string.h",
|
||||
"string_in": "String",
|
||||
"string_out": "String",
|
||||
"to_string_out": "toString(%s)",
|
||||
"export_macro": "LIB_EXPORT",
|
||||
"export_header": "lib/lib_export.h"
|
||||
},
|
||||
|
||||
"imported": {
|
||||
"path": "../relative/path/imported_protocol.json",
|
||||
"package": "either/include/imported/files/from/here",
|
||||
"header": "or/include/them/all/together/like/this/imported_protocol.h",
|
||||
"to_imported_string": "toImportedString(%s)",
|
||||
"from_imported_string": "fromImportedString(%s)",
|
||||
"namespace": ["imported_project", "protocol"]
|
||||
},
|
||||
|
||||
"lib": {
|
||||
"package": "include/lib/files/like/this",
|
||||
"output": "place/generated/lib/files/here",
|
||||
"string_header": "string/implementation.h",
|
||||
"platform_header": "platform/implementation.h",
|
||||
"export_macro": "LIB_EXPORT",
|
||||
"export_header": "lib/lib_export.h"
|
||||
}
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
{
|
||||
"errors": [
|
||||
"Domain.event: event has been removed",
|
||||
"Domain.command: command has been removed",
|
||||
"Domain.command.param parameter->Domain.TypeName.property: required property has been removed"
|
||||
]
|
||||
}
|
27
third_party/inspector_protocol/LICENSE
vendored
Normal file
27
third_party/inspector_protocol/LICENSE
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
// Copyright 2016 The Chromium Authors. All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * 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.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
|
||||
// OWNER OR 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.
|
1
third_party/WebKit/Source/platform/inspector_protocol/OWNERS → third_party/inspector_protocol/OWNERS
vendored
1
third_party/WebKit/Source/platform/inspector_protocol/OWNERS → third_party/inspector_protocol/OWNERS
vendored
@ -1,3 +1,4 @@
|
||||
set noparent
|
||||
alph@chromium.org
|
||||
caseq@chromium.org
|
||||
dgozman@chromium.org
|
16
third_party/inspector_protocol/README.chromium
vendored
Normal file
16
third_party/inspector_protocol/README.chromium
vendored
Normal file
@ -0,0 +1,16 @@
|
||||
Name: inspector protocol
|
||||
Short Name: inspector_protocol
|
||||
URL: https://chromium.googlesource.com/deps/inspector_protocol/
|
||||
Version: 0
|
||||
Revision: 6c15061ecf7168e520d33633b217e029e74760a7
|
||||
License: BSD
|
||||
License File: LICENSE
|
||||
Security Critical: no
|
||||
|
||||
Description:
|
||||
WebKit/core/inspector uses these scripts to generate handlers from protocol
|
||||
description.
|
||||
|
||||
Local modifications:
|
||||
- This only includes the lib/ and templates/ directories, scripts, build
|
||||
and the LICENSE files.
|
@ -23,9 +23,8 @@ template("inspector_protocol_generate") {
|
||||
assert(defined(invoker.config_file))
|
||||
assert(defined(invoker.out_dir))
|
||||
assert(defined(invoker.outputs))
|
||||
|
||||
inspector_protocol_dir =
|
||||
"//third_party/WebKit/Source/platform/inspector_protocol"
|
||||
assert(defined(invoker.inspector_protocol_dir))
|
||||
inspector_protocol_dir = invoker.inspector_protocol_dir
|
||||
|
||||
action(target_name) {
|
||||
script = "$inspector_protocol_dir/CodeGenerator.py"
|
@ -2,8 +2,6 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
# Note: do not remove this file, it's used by v8's gyp.
|
||||
# It will be moved out from platform/ soon.
|
||||
{
|
||||
'variables': {
|
||||
'inspector_protocol_files': [
|
Reference in New Issue
Block a user