Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: content/renderer/mus/render_widget_mus_connection.cc

Issue 2651593002: mus: Remove the old client lib. (Closed)
Patch Set: restore test Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/mus/render_widget_mus_connection.cc
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc
index 24594cbbaabd97bf321ea7e6f689b70ce10b23eb..0d473b1fd242b79e46cb6ca3466fa0fb62dfdc52 100644
--- a/content/renderer/mus/render_widget_mus_connection.cc
+++ b/content/renderer/mus/render_widget_mus_connection.cc
@@ -8,7 +8,6 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "content/renderer/mus/compositor_mus_connection.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
#include "services/ui/public/cpp/window_compositor_frame_sink.h"
@@ -25,16 +24,7 @@ base::LazyInstance<ConnectionMap>::Leaky g_connections =
void RenderWidgetMusConnection::Bind(
mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request) {
- DCHECK(thread_checker_.CalledOnValidThread());
- RenderThreadImpl* render_thread = RenderThreadImpl::current();
- compositor_mus_connection_ = new CompositorMusConnection(
- routing_id_, render_thread->GetCompositorMainThreadTaskRunner(),
- render_thread->compositor_task_runner(), std::move(request),
- render_thread->input_handler_manager());
- if (window_compositor_frame_sink_binding_) {
- compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
- std::move(window_compositor_frame_sink_binding_));
- }
+ // TODO(sad): crbug.com/672913
}
std::unique_ptr<cc::CompositorFrameSink>
@@ -42,18 +32,8 @@ RenderWidgetMusConnection::CreateCompositorFrameSink(
const cc::FrameSinkId& frame_sink_id,
scoped_refptr<cc::ContextProvider> context_provider,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
- DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(!window_compositor_frame_sink_binding_);
-
- std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink(
- ui::WindowCompositorFrameSink::Create(
- frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager,
- &window_compositor_frame_sink_binding_));
- if (compositor_mus_connection_) {
- compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
- std::move(window_compositor_frame_sink_binding_));
- }
- return compositor_frame_sink;
+ // TODO(sad): crbug.com/672913
+ return nullptr;
}
// static
@@ -76,105 +56,10 @@ RenderWidgetMusConnection* RenderWidgetMusConnection::GetOrCreate(
}
RenderWidgetMusConnection::RenderWidgetMusConnection(int routing_id)
- : routing_id_(routing_id), input_handler_(nullptr) {
+ : routing_id_(routing_id) {
DCHECK(routing_id);
}
RenderWidgetMusConnection::~RenderWidgetMusConnection() {}
-void RenderWidgetMusConnection::FocusChangeComplete() {
- NOTIMPLEMENTED();
-}
-
-bool RenderWidgetMusConnection::HasTouchEventHandlersAt(
- const gfx::Point& point) const {
- return true;
-}
-
-void RenderWidgetMusConnection::ObserveGestureEventAndResult(
- const blink::WebGestureEvent& gesture_event,
- const gfx::Vector2dF& wheel_unused_delta,
- bool event_processed) {
- NOTIMPLEMENTED();
-}
-
-void RenderWidgetMusConnection::OnDidHandleKeyEvent() {
- NOTIMPLEMENTED();
-}
-
-void RenderWidgetMusConnection::OnDidOverscroll(
- const ui::DidOverscrollParams& params) {
- NOTIMPLEMENTED();
-}
-
-void RenderWidgetMusConnection::OnInputEventAck(
- std::unique_ptr<InputEventAck> input_event_ack) {
- DCHECK(!pending_ack_.is_null());
- pending_ack_.Run(input_event_ack->state ==
- InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED
- ? ui::mojom::EventResult::HANDLED
- : ui::mojom::EventResult::UNHANDLED);
- pending_ack_.Reset();
-}
-
-void RenderWidgetMusConnection::NotifyInputEventHandled(
- blink::WebInputEvent::Type handled_type,
- InputEventAckState ack_result) {
- NOTIMPLEMENTED();
-}
-
-void RenderWidgetMusConnection::SetInputHandler(
- RenderWidgetInputHandler* input_handler) {
- DCHECK(!input_handler_);
- input_handler_ = input_handler;
-}
-
-void RenderWidgetMusConnection::ShowVirtualKeyboard() {
- NOTIMPLEMENTED();
-}
-
-void RenderWidgetMusConnection::UpdateTextInputState() {
- NOTIMPLEMENTED();
-}
-
-bool RenderWidgetMusConnection::WillHandleGestureEvent(
- const blink::WebGestureEvent& event) {
- NOTIMPLEMENTED();
- return false;
-}
-
-bool RenderWidgetMusConnection::WillHandleMouseEvent(
- const blink::WebMouseEvent& event) {
- // TODO(fsamuel): NOTIMPLEMENTED() is too noisy.
- // NOTIMPLEMENTED();
- return false;
-}
-
-void RenderWidgetMusConnection::OnConnectionLost() {
- DCHECK(thread_checker_.CalledOnValidThread());
- g_connections.Get().erase(routing_id_);
- delete this;
-}
-
-void RenderWidgetMusConnection::OnWindowInputEvent(
- blink::WebScopedInputEvent input_event,
- const base::Callback<void(ui::mojom::EventResult)>& ack) {
- DCHECK(thread_checker_.CalledOnValidThread());
- // If we don't yet have a RenderWidgetInputHandler then we don't yet have
- // an initialized RenderWidget.
- if (!input_handler_) {
- ack.Run(ui::mojom::EventResult::UNHANDLED);
- return;
- }
- // TODO(fsamuel): It would be nice to add this DCHECK but the reality is an
- // event could timeout and we could receive the next event before we ack the
- // previous event.
- // DCHECK(pending_ack_.is_null());
- pending_ack_ = ack;
- // TODO(fsamuel, sadrul): Track real latency info.
- ui::LatencyInfo latency_info;
- input_handler_->HandleInputEvent(*input_event, latency_info,
- DISPATCH_TYPE_BLOCKING);
-}
-
} // namespace content
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698