diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:15:37 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:15:37 +0000 |
| commit | 4795329fcd7308914fcdbee6f824c250cfae2629 (patch) | |
| tree | 905e1ab545c681bc6ab40043bd9370e7a7f8e89e /content/renderer/pepper | |
| parent | d732891b4ee22048d942a6d6523fbaa311c11cb4 (diff) | |
| download | chromium_src-4795329fcd7308914fcdbee6f824c250cfae2629.zip chromium_src-4795329fcd7308914fcdbee6f824c250cfae2629.tar.gz chromium_src-4795329fcd7308914fcdbee6f824c250cfae2629.tar.bz2 | |
Remove some content_child dependency from content_common
content_common does not have an explicit dependency on content_child in the GYP
files, yet depends on symbols from content_child. This causes order-dependent
linker errors on some builds (e.g. win8_aura). Fix this by refactoring
content::ChildThread to remove the need for that dependency, namely:
* Refactor content::ChildThread to allow users to access (and pass around) its
content::MessageRouter member for use in IPC messaging, instead of passing
around the ChildThread itself.
* Remove explicit check for ChildThread in content::VaapiVideoDecodeAccelerator.
* Update DEPS files accordingly.
BUG=351948
TEST=local build on desktop Linux
Review URL: https://codereview.chromium.org/198073003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper')
| -rw-r--r-- | content/renderer/pepper/ppb_broker_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/pepper/ppb_broker_impl.cc b/content/renderer/pepper/ppb_broker_impl.cc index 882c5db..bec93e0 100644 --- a/content/renderer/pepper/ppb_broker_impl.cc +++ b/content/renderer/pepper/ppb_broker_impl.cc @@ -33,7 +33,7 @@ PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance) connect_callback_(), pipe_handle_(PlatformFileToInt(base::kInvalidPlatformFileValue)), routing_id_(RenderThreadImpl::current()->GenerateRoutingID()) { - ChildThread::current()->AddRoute(routing_id_, this); + ChildThread::current()->GetRouter()->AddRoute(routing_id_, this); } PPB_Broker_Impl::~PPB_Broker_Impl() { @@ -44,7 +44,7 @@ PPB_Broker_Impl::~PPB_Broker_Impl() { // The plugin owns the handle. pipe_handle_ = PlatformFileToInt(base::kInvalidPlatformFileValue); - ChildThread::current()->RemoveRoute(routing_id_); + ChildThread::current()->GetRouter()->RemoveRoute(routing_id_); } PPB_Broker_API* PPB_Broker_Impl::AsPPB_Broker_API() { |