Clean up legacy IPC code in Ozone(2/3)
OzoneDrmMojo is 100% on. This is 2nd CL to remove more Legacy IPC code in ozone. Another CL(3/3) will remove ui/ozone/common/gpu/ozone_gpu_message_params.h and related files. Bug: 620927,806092 Change-Id: Id5cdca9f98677a617a551999d89864f10b753115 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2167765 Reviewed-by: Robert Kroeger <rjkroege@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kramer Ge <fangzhoug@chromium.org> Cr-Commit-Position: refs/heads/master@{#763571}
This commit is contained in:
components/viz/host
content
ui/ozone
@ -94,10 +94,6 @@ class VIZ_HOST_EXPORT GpuHostImpl : public mojom::GpuHost {
|
||||
mojo::PendingReceiver<service_manager::mojom::Service> receiver) = 0;
|
||||
#if defined(USE_OZONE)
|
||||
virtual void TerminateGpuProcess(const std::string& message) = 0;
|
||||
|
||||
// TODO(https://crbug.com/806092): Remove this when legacy IPC-based Ozone
|
||||
// is removed.
|
||||
virtual void SendGpuProcessMessage(IPC::Message* message) = 0;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
@ -611,10 +611,6 @@ void GpuProcessHost::TerminateGpuProcess(const std::string& message) {
|
||||
termination_origin_ = GpuTerminationOrigin::kOzoneWaylandProxy;
|
||||
process_->TerminateOnBadMessageReceived(message);
|
||||
}
|
||||
|
||||
void GpuProcessHost::SendGpuProcessMessage(IPC::Message* message) {
|
||||
Send(message);
|
||||
}
|
||||
#endif // defined(USE_OZONE)
|
||||
|
||||
// static
|
||||
|
@ -181,7 +181,6 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
|
||||
mojo::PendingReceiver<service_manager::mojom::Service> receiver) override;
|
||||
#if defined(USE_OZONE)
|
||||
void TerminateGpuProcess(const std::string& message) override;
|
||||
void SendGpuProcessMessage(IPC::Message* message) override;
|
||||
#endif
|
||||
|
||||
bool LaunchGpuProcess();
|
||||
|
@ -41,10 +41,6 @@
|
||||
#include "services/viz/privileged/mojom/gl/gpu_service.mojom.h"
|
||||
#include "third_party/skia/include/core/SkGraphics.h"
|
||||
|
||||
#if defined(USE_OZONE)
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#endif
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
#include "media/base/android/media_drm_bridge_client.h"
|
||||
#include "media/mojo/clients/mojo_android_overlay.h"
|
||||
@ -56,13 +52,6 @@ namespace {
|
||||
ChildThreadImpl::Options GetOptions() {
|
||||
ChildThreadImpl::Options::Builder builder;
|
||||
|
||||
#if defined(USE_OZONE)
|
||||
IPC::MessageFilter* message_filter =
|
||||
ui::OzonePlatform::GetInstance()->GetGpuMessageFilter();
|
||||
if (message_filter)
|
||||
builder.AddStartupFilter(message_filter);
|
||||
#endif
|
||||
|
||||
builder.ConnectToBrowser(true);
|
||||
builder.ExposesInterfacesToBrowser();
|
||||
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include "base/command_line.h"
|
||||
#include "ui/gl/gl_surface.h"
|
||||
#include "ui/gl/init/gl_factory.h"
|
||||
#include "ui/ozone/demo/skia/skia_gl_renderer.h"
|
||||
#include "ui/ozone/demo/skia/skia_surfaceless_gl_renderer.h"
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#include "ui/ozone/public/platform_window_surface.h"
|
||||
|
@ -10,7 +10,6 @@
|
||||
#include "ui/gfx/geometry/size.h"
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
#include "ui/ozone/demo/renderer_factory.h"
|
||||
#include "ui/ozone/public/ozone_gpu_test_helper.h"
|
||||
|
||||
namespace ui {
|
||||
|
||||
|
@ -78,10 +78,6 @@ const char* OzonePlatform::GetPlatformName() {
|
||||
return GetOzonePlatformName();
|
||||
}
|
||||
|
||||
IPC::MessageFilter* OzonePlatform::GetGpuMessageFilter() {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
PlatformClipboard* OzonePlatform::GetPlatformClipboard() {
|
||||
// Platforms that support system clipboard must override this method.
|
||||
return nullptr;
|
||||
|
@ -22,10 +22,6 @@ namespace display {
|
||||
class NativeDisplayDelegate;
|
||||
}
|
||||
|
||||
namespace IPC {
|
||||
class MessageFilter;
|
||||
}
|
||||
|
||||
namespace ui {
|
||||
|
||||
class CursorFactoryOzone;
|
||||
@ -131,7 +127,6 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
|
||||
virtual ui::OverlayManagerOzone* GetOverlayManager() = 0;
|
||||
virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() = 0;
|
||||
virtual ui::InputController* GetInputController() = 0;
|
||||
virtual IPC::MessageFilter* GetGpuMessageFilter();
|
||||
virtual ui::GpuPlatformSupportHost* GetGpuPlatformSupportHost() = 0;
|
||||
virtual std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() = 0;
|
||||
virtual std::unique_ptr<PlatformWindow> CreatePlatformWindow(
|
||||
|
Reference in New Issue
Block a user