Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: cc/surfaces/surface_factory_unittest.cc

Issue 2652343003: Replace source pointer in cc::CopyOutputRequest with a base::UnguessableToken (Closed)
Patch Set: c Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/surfaces/surface_factory_unittest.cc
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index 8099815d2298277b62ca6f9451a510a096f33020..72537fb12c75661f23a82dcb3a8f2b17fe779c11 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -31,6 +31,10 @@ static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
static constexpr FrameSinkId kAnotherArbitraryFrameSinkId(2, 2);
static const base::UnguessableToken kArbitraryToken =
base::UnguessableToken::Create();
+static auto kArbitrarySourceId1 =
+ base::UnguessableToken::Deserialize(0xdead, 0xbeef);
+static auto kArbitrarySourceId2 =
+ base::UnguessableToken::Deserialize(0xdead, 0xbee0);
class TestSurfaceFactoryClient : public SurfaceFactoryClient {
public:
@@ -629,14 +633,12 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
SurfaceFactory::DrawCallback());
EXPECT_EQ(last_created_surface_id().local_frame_id(), local_frame_id_);
}
- void* source1 = &source1;
- void* source2 = &source2;
bool called1 = false;
std::unique_ptr<CopyOutputRequest> request;
request = CopyOutputRequest::CreateRequest(
base::Bind(&CopyRequestTestCallback, &called1));
- request->set_source(source1);
+ request->set_source(kArbitrarySourceId1);
factory_->RequestCopyOfSurface(std::move(request));
EXPECT_FALSE(called1);
@@ -644,7 +646,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
bool called2 = false;
request = CopyOutputRequest::CreateRequest(
base::Bind(&CopyRequestTestCallback, &called2));
- request->set_source(source2);
+ request->set_source(kArbitrarySourceId2);
factory_->RequestCopyOfSurface(std::move(request));
// Callbacks have different sources so neither should be called.
@@ -654,7 +656,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
bool called3 = false;
request = CopyOutputRequest::CreateRequest(
base::Bind(&CopyRequestTestCallback, &called3));
- request->set_source(source1);
+ request->set_source(kArbitrarySourceId1);
factory_->RequestCopyOfSurface(std::move(request));
// Two callbacks are from source1, so the first should be called.

Powered by Google App Engine
This is Rietveld 408576698