diff options
author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:28:10 +0000 |
---|---|---|
committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:28:10 +0000 |
commit | 73af633e899f3e31157423c888004fdbfb0cd614 (patch) | |
tree | b8ce7f0c0dbd58d883a35f040ba66ef6ca90d889 /ppapi/shared_impl | |
parent | d00c8764450d87025a31769af9b41ca72a0ed981 (diff) | |
download | chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.zip chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.tar.gz chromium_src-73af633e899f3e31157423c888004fdbfb0cd614.tar.bz2 |
Create IPC channel to communicate with the renderer in NaClListener::OnStart().
This is the preparation of the irt_ppapi implementation for non-SFI mode.
Currently (on SFI mode), the IPC channel between the plugin and the renderer
is created in the CreateNaClChannel message handled by NaClIPCAdapter.
However, we won't need nor use NaClIPCAdapter, and it causes the circular
dependency of plugin initialization.
To split the dependency, create the IPC channels for the browser process and
the renderer process at once (in NaClListener::OnStart()).
Note that we cannot remove CreateNaClChannel message, because it is only way
to pass the initialization argument from the browser to plugin. So, it is just
kept with renaming.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
TEST=Ran trybot.
Review URL: https://codereview.chromium.org/150713003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
-rw-r--r-- | ppapi/shared_impl/ppapi_nacl_channel_args.cc | 18 | ||||
-rw-r--r-- | ppapi/shared_impl/ppapi_nacl_plugin_args.cc | 19 | ||||
-rw-r--r-- | ppapi/shared_impl/ppapi_nacl_plugin_args.h (renamed from ppapi/shared_impl/ppapi_nacl_channel_args.h) | 14 |
3 files changed, 26 insertions, 25 deletions
diff --git a/ppapi/shared_impl/ppapi_nacl_channel_args.cc b/ppapi/shared_impl/ppapi_nacl_channel_args.cc deleted file mode 100644 index 670e4e7..0000000 --- a/ppapi/shared_impl/ppapi_nacl_channel_args.cc +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2012 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 "ppapi/shared_impl/ppapi_nacl_channel_args.h" - -namespace ppapi { - -// We must provide explicit definitions of these functions for builds on -// Windows. -PpapiNaClChannelArgs::PpapiNaClChannelArgs() : off_the_record(false), - supports_dev_channel(false) { -} - -PpapiNaClChannelArgs::~PpapiNaClChannelArgs() { -} - -} // namespace ppapi diff --git a/ppapi/shared_impl/ppapi_nacl_plugin_args.cc b/ppapi/shared_impl/ppapi_nacl_plugin_args.cc new file mode 100644 index 0000000..2b36aa6 --- /dev/null +++ b/ppapi/shared_impl/ppapi_nacl_plugin_args.cc @@ -0,0 +1,19 @@ +// 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 "ppapi/shared_impl/ppapi_nacl_plugin_args.h" + +namespace ppapi { + +// We must provide explicit definitions of these functions for builds on +// Windows. +PpapiNaClPluginArgs::PpapiNaClPluginArgs() + : off_the_record(false), + supports_dev_channel(false) { +} + +PpapiNaClPluginArgs::~PpapiNaClPluginArgs() { +} + +} // namespace ppapi diff --git a/ppapi/shared_impl/ppapi_nacl_channel_args.h b/ppapi/shared_impl/ppapi_nacl_plugin_args.h index 1e4e4d5..2f18c8e 100644 --- a/ppapi/shared_impl/ppapi_nacl_channel_args.h +++ b/ppapi/shared_impl/ppapi_nacl_plugin_args.h @@ -1,9 +1,9 @@ -// Copyright (c) 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 PPAPI_SHARED_IMPL_PPAPI_CREATE_NACL_CHANNEL_ARGS_H -#define PPAPI_SHARED_IMPL_PPAPI_CREATE_NACL_CHANNEL_ARGS_H +#ifndef PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H +#define PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H #include <string> #include <vector> @@ -12,10 +12,10 @@ namespace ppapi { -struct PPAPI_SHARED_EXPORT PpapiNaClChannelArgs { +struct PPAPI_SHARED_EXPORT PpapiNaClPluginArgs { public: - PpapiNaClChannelArgs(); - ~PpapiNaClChannelArgs(); + PpapiNaClPluginArgs(); + ~PpapiNaClPluginArgs(); bool off_the_record; PpapiPermissions permissions; @@ -28,4 +28,4 @@ struct PPAPI_SHARED_EXPORT PpapiNaClChannelArgs { } // namespace ppapi -#endif // PPAPI_SHARED_IMPL_PPAPI_CREATE_NACL_CHANNEL_ARGS_H +#endif // PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H |