| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 87a0cf4659d8599a6dbcbff18e6a6b168b2c5f76..1aee05aae1b72ccbda49d0c40cbd5452a46e2924 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -69,10 +69,6 @@
|
| #include "mojo/edk/embedder/embedder.h"
|
| #include "mojo/edk/embedder/platform_channel_pair.h"
|
|
|
| -#if defined(USE_OZONE)
|
| -#include "ui/ozone/public/client_native_pixmap_factory.h"
|
| -#endif
|
| -
|
| #if defined(OS_POSIX)
|
| #include "base/posix/global_descriptors.h"
|
| #include "content/public/common/content_descriptors.h"
|
| @@ -175,31 +171,6 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
|
|
|
| #endif // OS(POSIX)
|
|
|
| -#if defined(USE_OZONE)
|
| -class ClientNativePixmapFactoryFilter : public IPC::MessageFilter {
|
| - public:
|
| - // Overridden from IPC::MessageFilter:
|
| - bool OnMessageReceived(const IPC::Message& message) override {
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(ClientNativePixmapFactoryFilter, message)
|
| - IPC_MESSAGE_HANDLER(ChildProcessMsg_InitializeClientNativePixmapFactory,
|
| - OnInitializeClientNativePixmapFactory)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| - }
|
| -
|
| - protected:
|
| - ~ClientNativePixmapFactoryFilter() override {}
|
| -
|
| - void OnInitializeClientNativePixmapFactory(
|
| - const base::FileDescriptor& device_fd) {
|
| - ui::ClientNativePixmapFactory::GetInstance()->Initialize(
|
| - base::ScopedFD(device_fd.fd));
|
| - }
|
| -};
|
| -#endif
|
| -
|
| #if defined(OS_ANDROID)
|
| // A class that allows for triggering a clean shutdown from another
|
| // thread through draining the main thread's msg loop.
|
| @@ -478,10 +449,6 @@ void ChildThreadImpl::Init(const Options& options) {
|
| channel_->AddFilter(new SuicideOnChannelErrorFilter());
|
| #endif
|
|
|
| -#if defined(USE_OZONE)
|
| - channel_->AddFilter(new ClientNativePixmapFactoryFilter());
|
| -#endif
|
| -
|
| // Add filters passed here via options.
|
| for (auto startup_filter : options.startup_filters) {
|
| channel_->AddFilter(startup_filter);
|
|
|