diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc index a0df4daa0420f42d0032c58940d80d7674a9b9f0..e6d3ed0471f3ad2fca1eaf765c924df74b81dd6f 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(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 9425e2a6c63b3898036c8b2bd944d870bbe70a02..c0df144abaeb7cba760d03d8fad2c4c4da3ce637 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 e045003a2ecb1c4517a48e6916bebe84b4b87f8b..f671249cb3a86c5aa7a8a6216be5b618ded178e5 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;