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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/resolve_proxy_msg_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 6d840d7043a0b55a91c0ebb661165e13ae43e41a..13d986b9f51b8d5c67793e1097d8c600c33354ca 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -658,10 +658,10 @@ class RenderWidgetHostViewAuraOverscrollTest
return;
}
- if (WebInputEventTraits::IgnoresAckDisposition(*params.a))
+ if (WebInputEventTraits::IgnoresAckDisposition(*get<0>(params)))
return;
- SendInputEventACK(params.a->type, ack_result);
+ SendInputEventACK(get<0>(params)->type, ack_result);
}
SyntheticWebTouchEvent touch_event_;
@@ -903,19 +903,20 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCompositionText) {
InputMsg_ImeSetComposition::Param params;
InputMsg_ImeSetComposition::Read(msg, &params);
// composition text
- EXPECT_EQ(composition_text.text, params.a);
+ EXPECT_EQ(composition_text.text, get<0>(params));
// underlines
- ASSERT_EQ(underlines.size(), params.b.size());
+ ASSERT_EQ(underlines.size(), get<1>(params).size());
for (size_t i = 0; i < underlines.size(); ++i) {
- EXPECT_EQ(underlines[i].start_offset, params.b[i].startOffset);
- EXPECT_EQ(underlines[i].end_offset, params.b[i].endOffset);
- EXPECT_EQ(underlines[i].color, params.b[i].color);
- EXPECT_EQ(underlines[i].thick, params.b[i].thick);
- EXPECT_EQ(underlines[i].background_color, params.b[i].backgroundColor);
+ EXPECT_EQ(underlines[i].start_offset, get<1>(params)[i].startOffset);
+ EXPECT_EQ(underlines[i].end_offset, get<1>(params)[i].endOffset);
+ EXPECT_EQ(underlines[i].color, get<1>(params)[i].color);
+ EXPECT_EQ(underlines[i].thick, get<1>(params)[i].thick);
+ EXPECT_EQ(underlines[i].background_color,
+ get<1>(params)[i].backgroundColor);
}
// highlighted range
- EXPECT_EQ(4, params.c) << "Should be the same to the caret pos";
- EXPECT_EQ(4, params.d) << "Should be the same to the caret pos";
+ EXPECT_EQ(4, get<2>(params)) << "Should be the same to the caret pos";
+ EXPECT_EQ(4, get<3>(params)) << "Should be the same to the caret pos";
}
view_->ImeCancelComposition();
@@ -1139,9 +1140,9 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ("100x100", params.a.new_size.ToString()); // dip size
+ EXPECT_EQ("100x100", get<0>(params).new_size.ToString()); // dip size
EXPECT_EQ("100x100",
- params.a.physical_backing_size.ToString()); // backing size
+ get<0>(params).physical_backing_size.ToString()); // backing size
}
widget_host_->ResetSizeAndRepaintPendingFlags();
@@ -1156,10 +1157,10 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(2.0f, params.a.screen_info.deviceScaleFactor);
- EXPECT_EQ("100x100", params.a.new_size.ToString()); // dip size
+ EXPECT_EQ(2.0f, get<0>(params).screen_info.deviceScaleFactor);
+ EXPECT_EQ("100x100", get<0>(params).new_size.ToString()); // dip size
EXPECT_EQ("200x200",
- params.a.physical_backing_size.ToString()); // backing size
+ get<0>(params).physical_backing_size.ToString()); // backing size
}
widget_host_->ResetSizeAndRepaintPendingFlags();
@@ -1174,10 +1175,10 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(1.0f, params.a.screen_info.deviceScaleFactor);
- EXPECT_EQ("100x100", params.a.new_size.ToString()); // dip size
+ EXPECT_EQ(1.0f, get<0>(params).screen_info.deviceScaleFactor);
+ EXPECT_EQ("100x100", get<0>(params).new_size.ToString()); // dip size
EXPECT_EQ("100x100",
- params.a.physical_backing_size.ToString()); // backing size
+ get<0>(params).physical_backing_size.ToString()); // backing size
}
}
@@ -1342,14 +1343,14 @@ TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) {
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
EXPECT_EQ("0,0 800x600",
- gfx::Rect(params.a.screen_info.availableRect).ToString());
- EXPECT_EQ("800x600", params.a.new_size.ToString());
+ gfx::Rect(get<0>(params).screen_info.availableRect).ToString());
+ EXPECT_EQ("800x600", get<0>(params).new_size.ToString());
// Resizes are blocked until we swapped a frame of the correct size, and
// we've committed it.
view_->OnSwapCompositorFrame(
0,
MakeDelegatedFrame(
- 1.f, params.a.new_size, gfx::Rect(params.a.new_size)));
+ 1.f, get<0>(params).new_size, gfx::Rect(get<0>(params).new_size)));
ui::DrawWaiterForTest::WaitForCommit(
root_window->GetHost()->compositor());
}
@@ -1367,12 +1368,12 @@ TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) {
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
EXPECT_EQ("0,0 1600x1200",
- gfx::Rect(params.a.screen_info.availableRect).ToString());
- EXPECT_EQ("1600x1200", params.a.new_size.ToString());
+ gfx::Rect(get<0>(params).screen_info.availableRect).ToString());
+ EXPECT_EQ("1600x1200", get<0>(params).new_size.ToString());
view_->OnSwapCompositorFrame(
0,
MakeDelegatedFrame(
- 1.f, params.a.new_size, gfx::Rect(params.a.new_size)));
+ 1.f, get<0>(params).new_size, gfx::Rect(get<0>(params).new_size)));
ui::DrawWaiterForTest::WaitForCommit(
root_window->GetHost()->compositor());
}
@@ -1471,7 +1472,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(size2.ToString(), params.a.new_size.ToString());
+ EXPECT_EQ(size2.ToString(), get<0>(params).new_size.ToString());
}
// Send resize ack to observe new Resize messages.
update_params.view_size = size2;
@@ -1522,7 +1523,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(size3.ToString(), params.a.new_size.ToString());
+ EXPECT_EQ(size3.ToString(), get<0>(params).new_size.ToString());
}
update_params.view_size = size3;
widget_host_->OnMessageReceived(
@@ -2096,7 +2097,7 @@ TEST_F(RenderWidgetHostViewAuraTest, VisibleViewportTest) {
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(message, &params);
- EXPECT_EQ(60, params.a.visible_viewport_size.height());
+ EXPECT_EQ(60, get<0>(params).visible_viewport_size.height());
}
// Ensures that touch event positions are never truncated to integers.
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/resolve_proxy_msg_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698