diff options
| -rw-r--r-- | mojo/apps/js/bindings/codec_unittests.js | 2 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/connector_unittests.js | 8 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/core_unittests.js | 2 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/gl/context.h | 2 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/gl/module.cc | 2 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/threading.cc | 2 | ||||
| -rw-r--r-- | mojo/apps/js/main.js | 4 | ||||
| -rw-r--r-- | mojo/apps/js/mojo_runner_delegate.cc | 4 | ||||
| -rw-r--r-- | mojo/apps/js/test/run_js_tests.cc | 2 | ||||
| -rw-r--r-- | mojo/bindings/js/DEPS | 4 | ||||
| -rw-r--r-- | mojo/bindings/js/core.cc (renamed from mojo/apps/js/bindings/core.cc) | 8 | ||||
| -rw-r--r-- | mojo/bindings/js/core.h (renamed from mojo/apps/js/bindings/core.h) | 8 | ||||
| -rw-r--r-- | mojo/bindings/js/handle.cc (renamed from mojo/apps/js/bindings/handle.cc) | 4 | ||||
| -rw-r--r-- | mojo/bindings/js/handle.h (renamed from mojo/apps/js/bindings/handle.h) | 8 | ||||
| -rw-r--r-- | mojo/bindings/js/support.cc (renamed from mojo/apps/js/bindings/support.cc) | 10 | ||||
| -rw-r--r-- | mojo/bindings/js/support.h (renamed from mojo/apps/js/bindings/support.h) | 8 | ||||
| -rw-r--r-- | mojo/bindings/js/waiting_callback.cc (renamed from mojo/apps/js/bindings/waiting_callback.cc) | 4 | ||||
| -rw-r--r-- | mojo/bindings/js/waiting_callback.h (renamed from mojo/apps/js/bindings/waiting_callback.h) | 8 | ||||
| -rw-r--r-- | mojo/mojo.gyp | 27 | ||||
| -rw-r--r-- | mojo/mojo_apps.gypi | 9 | ||||
| -rw-r--r-- | mojo/public/bindings/generators/js_templates/module.js.tmpl | 4 | ||||
| -rw-r--r-- | mojo/public/bindings/js/codec.js (renamed from mojo/apps/js/bindings/codec.js) | 4 | ||||
| -rw-r--r-- | mojo/public/bindings/js/connector.js (renamed from mojo/apps/js/bindings/connector.js) | 10 |
23 files changed, 84 insertions, 60 deletions
diff --git a/mojo/apps/js/bindings/codec_unittests.js b/mojo/apps/js/bindings/codec_unittests.js index 7fbea14..8e264d9 100644 --- a/mojo/apps/js/bindings/codec_unittests.js +++ b/mojo/apps/js/bindings/codec_unittests.js @@ -4,7 +4,7 @@ define([ "gin/test/expect", - "mojo/apps/js/bindings/codec", + "mojo/public/bindings/js/codec", "mojo/public/bindings/tests/sample_service.mojom", ], function(expect, codec, sample) { testBar(); diff --git a/mojo/apps/js/bindings/connector_unittests.js b/mojo/apps/js/bindings/connector_unittests.js index c7c0c15..8777b6f 100644 --- a/mojo/apps/js/bindings/connector_unittests.js +++ b/mojo/apps/js/bindings/connector_unittests.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // Mock out the support module to avoid depending on the message loop. -define("mojo/apps/js/bindings/support", function() { +define("mojo/bindings/js/support", function() { var waitingCallbacks = []; function WaitCookie(id) { @@ -46,9 +46,9 @@ define("mojo/apps/js/bindings/support", function() { define([ "gin/test/expect", - "mojo/apps/js/bindings/support", - "mojo/apps/js/bindings/core", - "mojo/apps/js/bindings/connector", + "mojo/bindings/js/support", + "mojo/bindings/js/core", + "mojo/public/bindings/js/connector", "mojo/public/bindings/tests/sample_service.mojom", ], function(expect, mockSupport, core, connector, sample) { diff --git a/mojo/apps/js/bindings/core_unittests.js b/mojo/apps/js/bindings/core_unittests.js index 5b900a0..b085cd0 100644 --- a/mojo/apps/js/bindings/core_unittests.js +++ b/mojo/apps/js/bindings/core_unittests.js @@ -4,7 +4,7 @@ define([ "gin/test/expect", - "mojo/apps/js/bindings/core", + "mojo/bindings/js/core", ], function(expect, core) { runWithPipe(testNop); runWithPipe(testReadAndWriteMessage); diff --git a/mojo/apps/js/bindings/gl/context.h b/mojo/apps/js/bindings/gl/context.h index d8daa82..7cf3979 100644 --- a/mojo/apps/js/bindings/gl/context.h +++ b/mojo/apps/js/bindings/gl/context.h @@ -12,7 +12,7 @@ #include "gin/public/wrapper_info.h" #include "gin/runner.h" #include "gin/wrappable.h" -#include "mojo/apps/js/bindings/handle.h" +#include "mojo/bindings/js/handle.h" #include "mojo/public/gles2/gles2.h" #include "v8/include/v8.h" diff --git a/mojo/apps/js/bindings/gl/module.cc b/mojo/apps/js/bindings/gl/module.cc index ef53e3d..413f22ed 100644 --- a/mojo/apps/js/bindings/gl/module.cc +++ b/mojo/apps/js/bindings/gl/module.cc @@ -10,7 +10,7 @@ #include "gin/per_isolate_data.h" #include "gin/wrappable.h" #include "mojo/apps/js/bindings/gl/context.h" -#include "mojo/apps/js/bindings/handle.h" +#include "mojo/bindings/js/handle.h" namespace mojo { namespace js { diff --git a/mojo/apps/js/bindings/threading.cc b/mojo/apps/js/bindings/threading.cc index 4b10bff..64e32fc 100644 --- a/mojo/apps/js/bindings/threading.cc +++ b/mojo/apps/js/bindings/threading.cc @@ -7,7 +7,7 @@ #include "base/message_loop/message_loop.h" #include "gin/object_template_builder.h" #include "gin/per_isolate_data.h" -#include "mojo/apps/js/bindings/handle.h" +#include "mojo/bindings/js/handle.h" namespace mojo { namespace apps { diff --git a/mojo/apps/js/main.js b/mojo/apps/js/main.js index 55bab29..355fb97 100644 --- a/mojo/apps/js/main.js +++ b/mojo/apps/js/main.js @@ -6,8 +6,8 @@ define([ 'console', 'monotonic_clock', 'timer', - 'mojo/apps/js/bindings/connector', - 'mojo/apps/js/bindings/core', + 'mojo/public/bindings/js/connector', + 'mojo/bindings/js/core', 'mojo/apps/js/bindings/gl', 'mojo/apps/js/bindings/threading', 'mojo/services/native_viewport/native_viewport.mojom', diff --git a/mojo/apps/js/mojo_runner_delegate.cc b/mojo/apps/js/mojo_runner_delegate.cc index 58cb333..2a6c1bd 100644 --- a/mojo/apps/js/mojo_runner_delegate.cc +++ b/mojo/apps/js/mojo_runner_delegate.cc @@ -11,11 +11,11 @@ #include "gin/modules/module_registry.h" #include "gin/modules/timer.h" #include "gin/try_catch.h" -#include "mojo/apps/js/bindings/core.h" #include "mojo/apps/js/bindings/gl/module.h" #include "mojo/apps/js/bindings/monotonic_clock.h" -#include "mojo/apps/js/bindings/support.h" #include "mojo/apps/js/bindings/threading.h" +#include "mojo/bindings/js/core.h" +#include "mojo/bindings/js/support.h" namespace mojo { namespace apps { diff --git a/mojo/apps/js/test/run_js_tests.cc b/mojo/apps/js/test/run_js_tests.cc index 30c2ea5..872e5e3 100644 --- a/mojo/apps/js/test/run_js_tests.cc +++ b/mojo/apps/js/test/run_js_tests.cc @@ -9,9 +9,9 @@ #include "gin/modules/timer.h" #include "gin/test/file_runner.h" #include "gin/test/gtest.h" -#include "mojo/apps/js/bindings/core.h" #include "mojo/apps/js/bindings/monotonic_clock.h" #include "mojo/apps/js/bindings/threading.h" +#include "mojo/bindings/js/core.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/bindings/js/DEPS b/mojo/bindings/js/DEPS new file mode 100644 index 0000000..d974b68 --- /dev/null +++ b/mojo/bindings/js/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+gin", + "+v8", +] diff --git a/mojo/apps/js/bindings/core.cc b/mojo/bindings/js/core.cc index fc7ac02..83ab467 100644 --- a/mojo/apps/js/bindings/core.cc +++ b/mojo/bindings/js/core.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#include "mojo/apps/js/bindings/core.h" +#include "mojo/bindings/js/core.h" #include "base/bind.h" #include "base/logging.h" @@ -14,7 +14,7 @@ #include "gin/object_template_builder.h" #include "gin/per_isolate_data.h" #include "gin/public/wrapper_info.h" -#include "mojo/apps/js/bindings/handle.h" +#include "mojo/bindings/js/handle.h" namespace mojo { namespace js { @@ -86,7 +86,7 @@ gin::WrapperInfo g_wrapper_info = { gin::kEmbedderNativeGin }; } // namespace -const char Core::kModuleName[] = "mojo/apps/js/bindings/core"; +const char Core::kModuleName[] = "mojo/bindings/js/core"; v8::Local<v8::Value> Core::GetModule(v8::Isolate* isolate) { gin::PerIsolateData* data = gin::PerIsolateData::From(isolate); diff --git a/mojo/apps/js/bindings/core.h b/mojo/bindings/js/core.h index 3ff2828..bde327c 100644 --- a/mojo/apps/js/bindings/core.h +++ b/mojo/bindings/js/core.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef MOJO_APPS_JS_BINDINGS_CORE_H_ -#define MOJO_APPS_JS_BINDINGS_CORE_H_ +#ifndef MOJO_BINDINGS_JS_CORE_H_ +#define MOJO_BINDINGS_JS_CORE_H_ #include "v8/include/v8.h" @@ -19,4 +19,4 @@ class Core { } // namespace js } // namespace mojo -#endif // MOJO_APPS_JS_BINDINGS_CORE_H_ +#endif // MOJO_BINDINGS_JS_CORE_H_ diff --git a/mojo/apps/js/bindings/handle.cc b/mojo/bindings/js/handle.cc index 068be2d..a6c229b 100644 --- a/mojo/apps/js/bindings/handle.cc +++ b/mojo/bindings/js/handle.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#include "mojo/apps/js/bindings/handle.h" +#include "mojo/bindings/js/handle.h" namespace gin { diff --git a/mojo/apps/js/bindings/handle.h b/mojo/bindings/js/handle.h index 8bae517..ee83396 100644 --- a/mojo/apps/js/bindings/handle.h +++ b/mojo/bindings/js/handle.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef MOJO_APPS_JS_BINDINGS_HANDLE_H_ -#define MOJO_APPS_JS_BINDINGS_HANDLE_H_ +#ifndef MOJO_BINDINGS_JS_HANDLE_H_ +#define MOJO_BINDINGS_JS_HANDLE_H_ #include "gin/converter.h" #include "mojo/public/system/core_cpp.h" @@ -20,4 +20,4 @@ struct Converter<mojo::Handle> { } // namespace gin -#endif // MOJO_APPS_JS_BINDINGS_HANDLE_H_ +#endif // MOJO_BINDINGS_JS_HANDLE_H_ diff --git a/mojo/apps/js/bindings/support.cc b/mojo/bindings/js/support.cc index bdb554b..e5e5378 100644 --- a/mojo/apps/js/bindings/support.cc +++ b/mojo/bindings/js/support.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#include "mojo/apps/js/bindings/support.h" +#include "mojo/bindings/js/support.h" #include "base/bind.h" #include "gin/arguments.h" @@ -12,8 +12,8 @@ #include "gin/per_isolate_data.h" #include "gin/public/wrapper_info.h" #include "gin/wrappable.h" -#include "mojo/apps/js/bindings/handle.h" -#include "mojo/apps/js/bindings/waiting_callback.h" +#include "mojo/bindings/js/handle.h" +#include "mojo/bindings/js/waiting_callback.h" #include "mojo/public/environment/default_async_waiter.h" #include "mojo/public/system/core_cpp.h" @@ -55,7 +55,7 @@ gin::WrapperInfo g_wrapper_info = { gin::kEmbedderNativeGin }; } // namespace -const char Support::kModuleName[] = "mojo/apps/js/bindings/support"; +const char Support::kModuleName[] = "mojo/bindings/js/support"; v8::Local<v8::Value> Support::GetModule(v8::Isolate* isolate) { gin::PerIsolateData* data = gin::PerIsolateData::From(isolate); diff --git a/mojo/apps/js/bindings/support.h b/mojo/bindings/js/support.h index 4f0a4ef..0f6eb07c 100644 --- a/mojo/apps/js/bindings/support.h +++ b/mojo/bindings/js/support.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef MOJO_APPS_JS_BINDINGS_SUPPORT_H_ -#define MOJO_APPS_JS_BINDINGS_SUPPORT_H_ +#ifndef MOJO_BINDINGS_JS_SUPPORT_H_ +#define MOJO_BINDINGS_JS_SUPPORT_H_ #include "v8/include/v8.h" @@ -19,4 +19,4 @@ class Support { } // namespace js } // namespace mojo -#endif // MOJO_APPS_JS_BINDINGS_SUPPORT_H_ +#endif // MOJO_BINDINGS_JS_SUPPORT_H_ diff --git a/mojo/apps/js/bindings/waiting_callback.cc b/mojo/bindings/js/waiting_callback.cc index 9234316..21f52c4 100644 --- a/mojo/apps/js/bindings/waiting_callback.cc +++ b/mojo/bindings/js/waiting_callback.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#include "mojo/apps/js/bindings/waiting_callback.h" +#include "mojo/bindings/js/waiting_callback.h" #include "gin/per_context_data.h" diff --git a/mojo/apps/js/bindings/waiting_callback.h b/mojo/bindings/js/waiting_callback.h index c841028..a7f5a49 100644 --- a/mojo/apps/js/bindings/waiting_callback.h +++ b/mojo/bindings/js/waiting_callback.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_ -#define MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_ +#ifndef MOJO_BINDINGS_JS_WAITING_CALLBACK_H_ +#define MOJO_BINDINGS_JS_WAITING_CALLBACK_H_ #include "gin/handle.h" #include "gin/runner.h" @@ -46,4 +46,4 @@ class WaitingCallback : public gin::Wrappable<WaitingCallback> { } // namespace js } // namespace mojo -#endif // MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_ +#endif // MOJO_BINDINGS_JS_WAITING_CALLBACK_H_ diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index 084b182..6d2f3a7 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -424,6 +424,33 @@ 'service_manager/test.mojom', ], }, + { + 'target_name': 'mojo_js_bindings_lib', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../gin/gin.gyp:gin', + '../v8/tools/gyp/v8.gyp:v8', + 'mojo_common_lib', + 'mojo_system', + ], + 'export_dependent_settings': [ + '../base/base.gyp:base', + '../gin/gin.gyp:gin', + 'mojo_common_lib', + 'mojo_system', + ], + 'sources': [ + 'bindings/js/core.cc', + 'bindings/js/core.h', + 'bindings/js/handle.cc', + 'bindings/js/handle.h', + 'bindings/js/support.cc', + 'bindings/js/support.h', + 'bindings/js/waiting_callback.cc', + 'bindings/js/waiting_callback.h', + ], + }, ], 'conditions': [ ['OS=="android"', { diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi index dba5544..9186d40 100644 --- a/mojo/mojo_apps.gypi +++ b/mojo/mojo_apps.gypi @@ -12,6 +12,7 @@ 'mojo_environment_chromium', 'mojo_gles2', 'mojo_gles2_bindings', + 'mojo_js_bindings_lib', 'mojo_native_viewport_bindings', 'mojo_system', ], @@ -29,20 +30,12 @@ 'apps/js/mojo_runner_delegate.h', 'apps/js/bindings/threading.cc', 'apps/js/bindings/threading.h', - 'apps/js/bindings/core.cc', - 'apps/js/bindings/core.h', 'apps/js/bindings/gl/context.cc', 'apps/js/bindings/gl/context.h', 'apps/js/bindings/gl/module.cc', 'apps/js/bindings/gl/module.h', - 'apps/js/bindings/handle.cc', - 'apps/js/bindings/handle.h', 'apps/js/bindings/monotonic_clock.cc', 'apps/js/bindings/monotonic_clock.h', - 'apps/js/bindings/support.cc', - 'apps/js/bindings/support.h', - 'apps/js/bindings/waiting_callback.cc', - 'apps/js/bindings/waiting_callback.h', ], }, { diff --git a/mojo/public/bindings/generators/js_templates/module.js.tmpl b/mojo/public/bindings/generators/js_templates/module.js.tmpl index 82c84ec6b..2ecd60b 100644 --- a/mojo/public/bindings/generators/js_templates/module.js.tmpl +++ b/mojo/public/bindings/generators/js_templates/module.js.tmpl @@ -3,8 +3,8 @@ // found in the LICENSE file. define("{{module.path}}", [ - "mojo/apps/js/bindings/core", - "mojo/apps/js/bindings/codec", + "mojo/bindings/js/core", + "mojo/public/bindings/js/codec", {%- for import in imports %} "{{import.module.path}}", {%- endfor %} diff --git a/mojo/apps/js/bindings/codec.js b/mojo/public/bindings/js/codec.js index 6160fea..fb5ae5e 100644 --- a/mojo/apps/js/bindings/codec.js +++ b/mojo/public/bindings/js/codec.js @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -define("mojo/apps/js/bindings/codec", function() { +define("mojo/public/bindings/js/codec", function() { // Memory ------------------------------------------------------------------- diff --git a/mojo/apps/js/bindings/connector.js b/mojo/public/bindings/js/connector.js index a9126c0..9a1bfc7 100644 --- a/mojo/apps/js/bindings/connector.js +++ b/mojo/public/bindings/js/connector.js @@ -1,11 +1,11 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -define("mojo/apps/js/bindings/connector", [ - "mojo/apps/js/bindings/codec", - "mojo/apps/js/bindings/core", - "mojo/apps/js/bindings/support", +define("mojo/public/bindings/js/connector", [ + "mojo/public/bindings/js/codec", + "mojo/bindings/js/core", + "mojo/bindings/js/support", ], function(codec, core, support) { function Connector(handle) { |