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

Unified Diff: cc/ipc/struct_traits_unittest.cc

Issue 2655963006: Implemented StructTraits for cc::CopyOutputRequest (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
« no previous file with comments | « cc/ipc/copy_output_request_struct_traits.h ('k') | cc/ipc/traits_test_service.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/ipc/struct_traits_unittest.cc
diff --git a/cc/ipc/struct_traits_unittest.cc b/cc/ipc/struct_traits_unittest.cc
index f5313cf0c678650ec2b2b1bd13debb49264dd36c..b84233bad89a95ff5c26a2fd60da45a13c1b0c67 100644
--- a/cc/ipc/struct_traits_unittest.cc
+++ b/cc/ipc/struct_traits_unittest.cc
@@ -5,6 +5,7 @@
#include "base/message_loop/message_loop.h"
#include "cc/input/selection.h"
#include "cc/ipc/traits_test_service.mojom.h"
+#include "cc/output/copy_output_result.h"
#include "cc/quads/debug_border_draw_quad.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/render_pass_draw_quad.h"
@@ -50,6 +51,12 @@ class StructTraitsTest : public testing::Test, public mojom::TraitsTestService {
callback.Run(c);
}
+ void EchoCopyOutputRequest(
+ const CopyOutputRequest& c,
+ const EchoCopyOutputRequestCallback& callback) override {
+ callback.Run(std::move(c));
+ }
+
void EchoFilterOperation(
const FilterOperation& f,
const EchoFilterOperationCallback& callback) override {
@@ -116,6 +123,8 @@ class StructTraitsTest : public testing::Test, public mojom::TraitsTestService {
DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
};
+void StubCopyOutputRequestCallback(std::unique_ptr<CopyOutputResult> result) {}
+
} // namespace
TEST_F(StructTraitsTest, BeginFrameArgs) {
@@ -344,6 +353,48 @@ TEST_F(StructTraitsTest, CompositorFrameMetadata) {
EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]);
}
+TEST_F(StructTraitsTest, CopyOutputRequest) {
+ const gfx::Rect area(5, 7, 44, 55);
+ const auto callback = base::Bind(StubCopyOutputRequestCallback);
+ const int8_t mailbox_name[GL_MAILBOX_SIZE_CHROMIUM] = {
+ 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 3};
+ const uint32_t target = 3;
+ const auto source =
+ base::UnguessableToken::Deserialize(0xdeadbeef, 0xdeadf00d);
+ gpu::Mailbox mailbox;
+ mailbox.SetName(mailbox_name);
+ TextureMailbox texture_mailbox(mailbox, gpu::SyncToken(), target);
+
+ // Test with bitmap.
+ std::unique_ptr<CopyOutputRequest> input;
+ input = CopyOutputRequest::CreateBitmapRequest(callback);
+ input->set_area(area);
+ input->set_source(source);
+
+ mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
+ CopyOutputRequest output;
+ proxy->EchoCopyOutputRequest(*input.get(), &output);
+
+ EXPECT_TRUE(output.force_bitmap_result());
+ EXPECT_FALSE(output.has_texture_mailbox());
+ EXPECT_TRUE(output.has_area());
+ EXPECT_EQ(area, output.area());
+ EXPECT_EQ(source, output.source());
+
+ // Test with texture mailbox.
+ input = CopyOutputRequest::CreateRequest(callback);
+ input->SetTextureMailbox(texture_mailbox);
+
+ CopyOutputRequest output2;
+ proxy->EchoCopyOutputRequest(*input.get(), &output2);
+
+ EXPECT_TRUE(output2.has_texture_mailbox());
+ EXPECT_FALSE(output2.has_area());
+ EXPECT_EQ(mailbox, output2.texture_mailbox().mailbox());
+ EXPECT_EQ(target, output2.texture_mailbox().target());
+ EXPECT_FALSE(output2.has_source());
+}
+
TEST_F(StructTraitsTest, FilterOperation) {
const FilterOperation inputs[] = {
FilterOperation::CreateBlurFilter(20),
« no previous file with comments | « cc/ipc/copy_output_request_struct_traits.h ('k') | cc/ipc/traits_test_service.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698