-
Notifications
You must be signed in to change notification settings - Fork 6k
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.
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
Eliminate duplicated code when dealing with pointer data #36822
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b337220
add methods
fzyzcjy c49e01a
add empty test
fzyzcjy f62484f
add unit test
fzyzcjy a80d625
Merge branch 'flutter:main' into feat/pointer-data-read
fzyzcjy 0edacf5
Update licenses_flutter
fzyzcjy f747418
add const
fzyzcjy adb93c5
size -> get length
fzyzcjy 0c149ed
add boundary checks
fzyzcjy c962756
Merge remote-tracking branch 'origin/master' into feat/pointer-data-read
fzyzcjy 4f0ebae
add tests
fzyzcjy 0f6feb5
remove death test since it says "Death tests use fork(), which is uns…
fzyzcjy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
// Copyright 2013 The Flutter Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
#include "flutter/lib/ui/window/pointer_data.h" | ||
|
||
#include <cstring> | ||
|
||
#include "gtest/gtest.h" | ||
#include "pointer_data_packet.h" | ||
|
||
namespace flutter { | ||
namespace testing { | ||
|
||
void CreateSimpleSimulatedPointerData(PointerData& data, // NOLINT | ||
PointerData::Change change, | ||
int64_t device, | ||
double dx, | ||
double dy, | ||
int64_t buttons) { | ||
data.time_stamp = 0; | ||
data.change = change; | ||
data.kind = PointerData::DeviceKind::kTouch; | ||
data.signal_kind = PointerData::SignalKind::kNone; | ||
data.device = device; | ||
data.pointer_identifier = 0; | ||
data.physical_x = dx; | ||
data.physical_y = dy; | ||
data.physical_delta_x = 0.0; | ||
data.physical_delta_y = 0.0; | ||
data.buttons = buttons; | ||
data.obscured = 0; | ||
data.synthesized = 0; | ||
data.pressure = 0.0; | ||
data.pressure_min = 0.0; | ||
data.pressure_max = 0.0; | ||
data.distance = 0.0; | ||
data.distance_max = 0.0; | ||
data.size = 0.0; | ||
data.radius_major = 0.0; | ||
data.radius_minor = 0.0; | ||
data.radius_min = 0.0; | ||
data.radius_max = 0.0; | ||
data.orientation = 0.0; | ||
data.tilt = 0.0; | ||
data.platformData = 0; | ||
data.scroll_delta_x = 0.0; | ||
data.scroll_delta_y = 0.0; | ||
} | ||
|
||
TEST(PointerDataPacketTest, CanGetPointerData) { | ||
auto packet = std::make_unique<PointerDataPacket>(1); | ||
PointerData data; | ||
CreateSimpleSimulatedPointerData(data, PointerData::Change::kAdd, 1, 2.0, 3.0, | ||
4); | ||
packet->SetPointerData(0, data); | ||
|
||
PointerData data_recovered = packet->GetPointerData(0); | ||
ASSERT_EQ(data_recovered.physical_x, 2.0); | ||
ASSERT_EQ(data_recovered.physical_y, 3.0); | ||
} | ||
|
||
TEST(PointerDataPacketTest, CanGetLength) { | ||
auto packet = std::make_unique<PointerDataPacket>(6); | ||
ASSERT_EQ(packet->GetLength(), (size_t)6); | ||
} | ||
|
||
} // namespace testing | ||
} // namespace flutter |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DCHECK only runs in debug mode. if the goal of this PR is to add bounds checking to make it safe, you need to always perform the bounds check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added DCHECK because originally there is no check at all and I dare not change semantics of the code (e.g. if no check because previous dev deliberately do so to avoid being too slow?). If you like, I will change to CHECK