From b1f39b7c1b922093021ea1225b461a135ecbfd51 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 28 Oct 2014 15:38:23 -0700 Subject: [PATCH] Move framework/inspector/server to services/inspector Moving the inspector WebSocket proxy server out of the framework directory simplifies the mappings for the HTTP servers. R=eseidel@chromium.org Review URL: https://codereview.chromium.org/687673004 --- BUILD.gn | 2 +- framework/inspector/BUILD.gn | 24 ------------------- framework/inspector/inspector.sky | 2 +- .../server => services/inspector}/BUILD.gn | 2 +- .../server => services/inspector}/DEPS | 0 .../inspector}/inspector.mojom | 0 .../inspector}/inspector_frontend_impl.cc | 2 +- .../inspector}/inspector_frontend_impl.h | 8 +++---- .../server => services/inspector}/server.cc | 2 +- tools/sky_server | 6 ----- .../layout_tests/servers/apache_http.py | 3 +++ 11 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 framework/inspector/BUILD.gn rename {framework/inspector/server => services/inspector}/BUILD.gn (97%) rename {framework/inspector/server => services/inspector}/DEPS (100%) rename {framework/inspector/server => services/inspector}/inspector.mojom (100%) rename {framework/inspector/server => services/inspector}/inspector_frontend_impl.cc (97%) rename {framework/inspector/server => services/inspector}/inspector_frontend_impl.h (85%) rename {framework/inspector/server => services/inspector}/server.cc (94%) diff --git a/BUILD.gn b/BUILD.gn index ae6ebfd0c4a..ee665ca6e7a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,7 +13,7 @@ group("sky") { "//sky/engine/platform:platform_unittests", "//sky/engine/web:sky_unittests", "//sky/engine/wtf:unittests", - "//sky/framework/inspector", + "//sky/services/inspector", "//sky/viewer", ] if (use_aura) { diff --git a/framework/inspector/BUILD.gn b/framework/inspector/BUILD.gn deleted file mode 100644 index a968b572f79..00000000000 --- a/framework/inspector/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 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. - -group("inspector") { - testonly = true - - deps = [ - "//sky/framework/inspector/server", - ":inspector_files", - ] -} - -copy("inspector_files") { - sources = [ - "console-agent.sky", - "dom-agent.sky", - "inspector.sky", - "page-agent.sky", - "worker-agent.sky", - ] - - outputs = [ "$target_gen_dir/{{source_file_part}}" ] -} diff --git a/framework/inspector/inspector.sky b/framework/inspector/inspector.sky index 80b285f093c..2ee9ed9a05f 100644 --- a/framework/inspector/inspector.sky +++ b/framework/inspector/inspector.sky @@ -1,7 +1,7 @@ - + diff --git a/framework/inspector/server/BUILD.gn b/services/inspector/BUILD.gn similarity index 97% rename from framework/inspector/server/BUILD.gn rename to services/inspector/BUILD.gn index d9a06a2b1f2..4fa90e070e1 100644 --- a/framework/inspector/server/BUILD.gn +++ b/services/inspector/BUILD.gn @@ -4,7 +4,7 @@ import("//mojo/public/tools/bindings/mojom.gni") -group("server") { +group("inspector") { testonly = true deps = [ diff --git a/framework/inspector/server/DEPS b/services/inspector/DEPS similarity index 100% rename from framework/inspector/server/DEPS rename to services/inspector/DEPS diff --git a/framework/inspector/server/inspector.mojom b/services/inspector/inspector.mojom similarity index 100% rename from framework/inspector/server/inspector.mojom rename to services/inspector/inspector.mojom diff --git a/framework/inspector/server/inspector_frontend_impl.cc b/services/inspector/inspector_frontend_impl.cc similarity index 97% rename from framework/inspector/server/inspector_frontend_impl.cc rename to services/inspector/inspector_frontend_impl.cc index 0865e91b9e3..d273a3c5b05 100644 --- a/framework/inspector/server/inspector_frontend_impl.cc +++ b/services/inspector/inspector_frontend_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/framework/inspector/server/inspector_frontend_impl.h" +#include "sky/services/inspector/inspector_frontend_impl.h" #include "base/lazy_instance.h" #include "net/server/http_server.h" diff --git a/framework/inspector/server/inspector_frontend_impl.h b/services/inspector/inspector_frontend_impl.h similarity index 85% rename from framework/inspector/server/inspector_frontend_impl.h rename to services/inspector/inspector_frontend_impl.h index cd9e726fdec..700a72f6308 100644 --- a/framework/inspector/server/inspector_frontend_impl.h +++ b/services/inspector/inspector_frontend_impl.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_ -#define SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_ +#ifndef SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_ +#define SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_ #include "mojo/public/cpp/application/interface_factory_impl.h" #include "mojo/public/cpp/bindings/interface_impl.h" #include "net/server/http_server.h" #include "net/socket/tcp_server_socket.h" -#include "sky/framework/inspector/server/inspector.mojom.h" +#include "sky/services/inspector/inspector.mojom.h" namespace sky { namespace inspector { @@ -53,4 +53,4 @@ typedef mojo::InterfaceFactoryImpl< } // namespace tester } // namespace sky -#endif // SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_ +#endif // SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_ diff --git a/framework/inspector/server/server.cc b/services/inspector/server.cc similarity index 94% rename from framework/inspector/server/server.cc rename to services/inspector/server.cc index 9f078d94058..2dbf9a7db90 100644 --- a/framework/inspector/server/server.cc +++ b/services/inspector/server.cc @@ -6,7 +6,7 @@ #include "mojo/public/c/system/main.h" #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/application_impl.h" -#include "sky/framework/inspector/server/inspector_frontend_impl.h" +#include "sky/services/inspector/inspector_frontend_impl.h" namespace sky { namespace inspector { diff --git a/tools/sky_server b/tools/sky_server index ae38fccc57c..1d875e15134 100755 --- a/tools/sky_server +++ b/tools/sky_server @@ -42,17 +42,11 @@ def main(): 'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky'), }, - # src-relative to avoid needing to rebuild when changing inspector: '/sky/framework': { 'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(SKY_ROOT, 'framework'), }, - '/sky/framework/inspector/server': { - 'tools.staticdir.on': True, - 'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky', 'framework', - 'inspector', 'server'), - }, } cherrypy.quickstart(config=config) diff --git a/tools/webkitpy/layout_tests/servers/apache_http.py b/tools/webkitpy/layout_tests/servers/apache_http.py index 82767d02dbb..203ce150949 100644 --- a/tools/webkitpy/layout_tests/servers/apache_http.py +++ b/tools/webkitpy/layout_tests/servers/apache_http.py @@ -60,6 +60,8 @@ class ApacheHTTP(server_base.ServerBase): self._filesystem.abspath(port_obj.gen_dir()), "mojo") sky_gen_dir = self._filesystem.join( self._filesystem.abspath(port_obj.gen_dir()), "sky") + sky_framework_dir = self._filesystem.join( + self._filesystem.abspath(port_obj.path_from_chromium_base("sky", "framework"))) js_test_resources_dir = self._filesystem.join(test_dir, "resources") media_resources_dir = self._filesystem.join(test_dir, "media") mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types") @@ -75,6 +77,7 @@ class ApacheHTTP(server_base.ServerBase): '-C', 'ServerRoot "%s"' % server_root, '-C', 'DocumentRoot "%s"' % test_dir, '-c', 'Alias /mojo "%s"' % mojo_gen_dir, + '-c', 'Alias /sky/framework "%s"' % sky_framework_dir, '-c', 'Alias /sky "%s"' % sky_gen_dir, '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir, '-c', 'Alias /media-resources "%s"' % media_resources_dir,