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/worker/websharedworker_stub.cc | |
| 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/worker/websharedworker_stub.cc')
| -rw-r--r-- | content/worker/websharedworker_stub.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 2737f6c..fd33a61 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -33,7 +33,7 @@ WebSharedWorkerStub::WebSharedWorkerStub( DCHECK(worker_thread); worker_thread->AddWorkerStub(this); // Start processing incoming IPCs for this worker. - worker_thread->AddRoute(route_id_, this); + worker_thread->GetRouter()->AddRoute(route_id_, this); // TODO(atwilson): Add support for NaCl when they support MessagePorts. impl_ = blink::WebSharedWorker::create(client()); @@ -48,7 +48,7 @@ WebSharedWorkerStub::~WebSharedWorkerStub() { WorkerThread* worker_thread = WorkerThread::current(); DCHECK(worker_thread); worker_thread->RemoveWorkerStub(this); - worker_thread->RemoveRoute(route_id_); + worker_thread->GetRouter()->RemoveRoute(route_id_); } void WebSharedWorkerStub::Shutdown() { |