Skip to content

Return early in InProgresStroke.UpdateShape when no update needed #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Feb 24, 2026
Merged

Return early in InProgresStroke.UpdateShape when no update needed #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ink/strokes/in_progress_stroke.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ absl::Status InProgressStroke::EnqueueInputs(
return absl::OkStatus();
}

bool InProgressStroke::HasQueuedInputs() const {
return !queued_real_inputs_.IsEmpty() ||
!queued_predicted_inputs_.IsEmpty() ||
// The only thing queued was empty, but a previous prediction was
// cleared as a result.
(queued_inputs_since_last_update_shape_ && PredictedInputCount() > 0);
}

absl::Status InProgressStroke::UpdateShape(Duration32 current_elapsed_time) {
if (!brush_.has_value()) {
return absl::FailedPreconditionError(
Expand All @@ -126,11 +134,14 @@ absl::Status InProgressStroke::UpdateShape(Duration32 current_elapsed_time) {
!status.ok()) {
return status;
}
if (inputs_are_finished_ || !queued_real_inputs_.IsEmpty() ||
!queued_predicted_inputs_.IsEmpty() ||
(queued_inputs_since_last_update_shape_ && PredictedInputCount() > 0)) {
current_elapsed_time_ = current_elapsed_time;

if (HasQueuedInputs()) {
// Erase any old predicted inputs.
processed_inputs_.Erase(real_input_count_);
} else if (!ChangesWithTime()) {
// Exit early if no change is needed.
return absl::OkStatus();
}

if (absl::Status status = processed_inputs_.Append(queued_real_inputs_);
Expand All @@ -152,8 +163,6 @@ absl::Status InProgressStroke::UpdateShape(Duration32 current_elapsed_time) {
return status;
}

current_elapsed_time_ = current_elapsed_time;

input_modeler_.ExtendStroke(queued_real_inputs_, queued_predicted_inputs_,
current_elapsed_time);
uint32_t num_coats = BrushCoatCount();
Expand All @@ -172,12 +181,7 @@ absl::Status InProgressStroke::UpdateShape(Duration32 current_elapsed_time) {
}

bool InProgressStroke::NeedsUpdate() const {
if (!queued_real_inputs_.IsEmpty() || !queued_predicted_inputs_.IsEmpty() ||
// There are processed predicted inputs to be cleared.
(queued_inputs_since_last_update_shape_ && PredictedInputCount() > 0)) {
return true;
}
return ChangesWithTime();
return HasQueuedInputs() || ChangesWithTime();
}

bool InProgressStroke::ChangesWithTime() const {
Expand Down
4 changes: 4 additions & 0 deletions ink/strokes/in_progress_stroke.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@ class InProgressStroke {

absl::Status ValidateNewElapsedTime(Duration32 current_elapsed_time) const;

// Whether `UpdateShape` might be needed due to a prior call to
// `EnqueueInputs`.
bool HasQueuedInputs() const;

std::optional<Brush> brush_;
// Real and predicted inputs that have been queued by calls to
// `EnqueueInputs()` since the last call to `UpdateShape()`.
Expand Down
Loading