From 826b2d46ef4e1a91fe301124adc4071542bccc95 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 10 Feb 2020 13:53:04 -0800 Subject: [PATCH] Apply lints from internal roll (#16509) --- fml/message_loop_task_queues.cc | 4 ++-- fml/message_loop_task_queues.h | 2 +- .../android/io/flutter/view/AccessibilityViewEmbedder.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fml/message_loop_task_queues.cc b/fml/message_loop_task_queues.cc index 52838676fea..8df08fa1b24 100644 --- a/fml/message_loop_task_queues.cc +++ b/fml/message_loop_task_queues.cc @@ -105,7 +105,7 @@ void MessageLoopTaskQueues::GetTasksToRunNow( if (top.GetTargetTime() > now) { break; } - invocations.emplace_back(std::move(top.GetTask())); + invocations.emplace_back(top.GetTask()); queue_entries_.at(top_queue)->delayed_tasks.pop(); if (type == FlushType::kSingle) { break; @@ -149,7 +149,7 @@ void MessageLoopTaskQueues::AddTaskObserver(TaskQueueId queue_id, const fml::closure& callback) { std::lock_guard guard(queue_mutex_); FML_DCHECK(callback != nullptr) << "Observer callback must be non-null."; - queue_entries_.at(queue_id)->task_observers[key] = std::move(callback); + queue_entries_.at(queue_id)->task_observers[key] = callback; } void MessageLoopTaskQueues::RemoveTaskObserver(TaskQueueId queue_id, diff --git a/fml/message_loop_task_queues.h b/fml/message_loop_task_queues.h index 8c1aa312150..3d2cfa0c176 100644 --- a/fml/message_loop_task_queues.h +++ b/fml/message_loop_task_queues.h @@ -135,7 +135,7 @@ class MessageLoopTaskQueues bool HasPendingTasksUnlocked(TaskQueueId queue_id) const; - const DelayedTask& PeekNextTaskUnlocked(TaskQueueId queue_id, + const DelayedTask& PeekNextTaskUnlocked(TaskQueueId owner, TaskQueueId& top_queue_id) const; fml::TimePoint GetNextWakeTimeUnlocked(TaskQueueId queue_id) const; diff --git a/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java b/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java index fb65b332e28..28ca6006568 100644 --- a/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java +++ b/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java @@ -364,7 +364,7 @@ final class AccessibilityViewEmbedder { MotionEvent.PointerCoords originCoords = new MotionEvent.PointerCoords(); event.getPointerCoords(i, originCoords); - pointerCoords[i] = new MotionEvent.PointerCoords((originCoords)); + pointerCoords[i] = new MotionEvent.PointerCoords(originCoords); pointerCoords[i].x -= displayBounds.left; pointerCoords[i].y -= displayBounds.top; } @@ -399,7 +399,7 @@ final class AccessibilityViewEmbedder { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (!(o instanceof ViewAndId)) return false; ViewAndId viewAndId = (ViewAndId) o; return id == viewAndId.id && view.equals(viewAndId.view); }