From 2b9905f7436027bb6efa5442cb344f991a04f141 Mon Sep 17 00:00:00 2001 From: renwei Date: Mon, 9 Dec 2024 21:17:56 +0800 Subject: [PATCH 1/2] fix build error Signed-off-by: renwei Change-Id: Id13e7330506f0460dbf580c57a015780d05fcb1a --- content/browser/renderer_host/input/input_router_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc index 65414e450d..a5b3266896 100644 --- a/content/browser/renderer_host/input/input_router_impl.cc +++ b/content/browser/renderer_host/input/input_router_impl.cc @@ -782,7 +782,7 @@ void InputRouterImpl::TouchEventHandled( WebInputEvent::GetName(touch_event.event.GetType()), "ack", InputEventResultStateToString(state)); #if defined(IS_OHOS) - LOG(INFO) << "InputRouterImpl::TouchEventHandled type:" << WebInputEvent::GetName(event.event.GetType()) + LOG(INFO) << "InputRouterImpl::TouchEventHandled type:" << WebInputEvent::GetName(touch_event.event.GetType()) << " ack " << InputEventResultStateToString(state); #endif if (source != blink::mojom::InputEventResultSource::kBrowser) -- Gitee From 0fcdb274d96c2bf23caa33f4d803a34ee1a18006 Mon Sep 17 00:00:00 2001 From: renwei Date: Tue, 10 Dec 2024 17:54:37 +0800 Subject: [PATCH 2/2] add event log Signed-off-by: renwei Change-Id: If4a5968d191c7653dc8d7f63dde944e0caf74d30 --- .../renderer_host/input/input_router_impl.cc | 32 ++++++++++++++----- .../renderer_host/render_widget_host_impl.cc | 7 ++-- .../renderer_host/render_widget_targeter.cc | 2 +- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc index f6854301c4..e6d3ed0471 100644 --- a/content/browser/renderer_host/input/input_router_impl.cc +++ b/content/browser/renderer_host/input/input_router_impl.cc @@ -123,7 +123,7 @@ void InputRouterImpl::SendMouseEvent( std::move(event_result_callback) .Run(mouse_event, blink::mojom::InputEventResultSource::kBrowser, blink::mojom::InputEventResultState::kIgnored); -#if defined(IS_OHOS) +#if BUILDFLAG(IS_OHOS) LOG(INFO) << "mouse event suppressed!"; #endif return; @@ -665,7 +665,7 @@ void InputRouterImpl::FilterAndSendWebInputEvent( blink::mojom::InputEventResultState filtered_state = client_->FilterInputEvent(input_event, latency_info); if (WasHandled(filtered_state)) { -#if defined(IS_OHOS) +#if BUILDFLAG(IS_OHOS) LOG(INFO) << "event was filtered for " << InputEventResultStateToString(filtered_state); TRACE_EVENT1("input", "InputEventFiltered", InputEventResultStateToString(filtered_state)); @@ -754,6 +754,20 @@ void InputRouterImpl::KeyboardEventHandled( // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. } +#if BUILDFLAG(IS_OHOS) +static bool FilterLogEvent(WebInputEvent::Type type) { + switch (type) { + case WebInputEvent::Type::kMouseUp: + case WebInputEvent::Type::kMouseDown: + case WebInputEvent::Type::kTouchStart: + case WebInputEvent::Type::kTouchEnd: + return true; + default: + return false; + } +} +#endif + void InputRouterImpl::MouseEventHandled( const MouseEventWithLatencyInfo& event, MouseEventCallback event_result_callback, @@ -766,9 +780,10 @@ void InputRouterImpl::MouseEventHandled( TRACE_EVENT2("input", "InputRouterImpl::MouseEventHandled", "type", WebInputEvent::GetName(event.event.GetType()), "ack", InputEventResultStateToString(state)); -#if defined(IS_OHOS) - LOG(INFO) << "InputRouterImpl::MouseEventHandled type:" << WebInputEvent::GetName(event.event.GetType()) - << " ack " << InputEventResultStateToString(state); +#if BUILDFLAG(IS_OHOS) + if (FilterLogEvent(event.event.GetType())) + LOG(INFO) << "InputRouterImpl::MouseEventHandled type:" << WebInputEvent::GetName(event.event.GetType()) + << " ack " << InputEventResultStateToString(state); #endif if (source != blink::mojom::InputEventResultSource::kBrowser) @@ -788,9 +803,10 @@ void InputRouterImpl::TouchEventHandled( TRACE_EVENT2("input", "InputRouterImpl::TouchEventHandled", "type", WebInputEvent::GetName(touch_event.event.GetType()), "ack", InputEventResultStateToString(state)); -#if defined(IS_OHOS) - LOG(INFO) << "InputRouterImpl::TouchEventHandled type:" << WebInputEvent::GetName(touch_event.event.GetType()) - << " ack " << InputEventResultStateToString(state); +#if BUILDFLAG(IS_OHOS) + if (FilterLogEvent(touch_event.event.GetType())) + LOG(INFO) << "InputRouterImpl::TouchEventHandled type:" << WebInputEvent::GetName(touch_event.event.GetType()) + << " ack " << InputEventResultStateToString(state); #endif if (source != blink::mojom::InputEventResultSource::kBrowser) client_->DecrementInFlightEventCount(source); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 9425e2a6c6..c0df144aba 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -1540,7 +1540,7 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo( } if (IsIgnoringInputEvents()) -#if defined(IS_OHOS) +#if BUILDFLAG(IS_OHOS) { LOG(INFO) << "ignore input events"; return; @@ -3478,7 +3478,7 @@ void RenderWidgetHostImpl::OnTouchEventAck( } bool RenderWidgetHostImpl::IsIgnoringInputEvents() const { -#if defined(IS_OHOS) +#if BUILDFLAG(IS_OHOS) if (agent_scheduling_group_->GetProcess()->IsBlocked()) { LOG(INFO) << "IsIgnoringInputEvents for gpu blocked"; return true; @@ -3579,6 +3579,9 @@ void RenderWidgetHostImpl::GotResponseToForceRedraw(int snapshot_id) { } void RenderWidgetHostImpl::DetachDelegate() { +#if BUILDFLAG(IS_OHOS) + LOG(INFO) << "RenderWidgetHostImpl DetachDelegate"; +#endif delegate_ = nullptr; latency_tracker_.reset_delegate(); } diff --git a/content/browser/renderer_host/render_widget_targeter.cc b/content/browser/renderer_host/render_widget_targeter.cc index e045003a2e..f671249cb3 100644 --- a/content/browser/renderer_host/render_widget_targeter.cc +++ b/content/browser/renderer_host/render_widget_targeter.cc @@ -156,7 +156,7 @@ void RenderWidgetTargeter::FindTargetAndDispatch( if (!requests_.empty()) { auto& request = requests_.back(); if (request.MergeEventIfPossible(event)) -#if defined(IS_OHOS) +#if BUILDFLAG(IS_OHOS) { LOG(INFO) << "merge input events"; return; -- Gitee