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

Unified Diff: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

Issue 2621303004: Keep track of coalesced events in main thread event queue (Closed)
Patch Set: Rebase 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: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
index 8b428a7b955ef66d27e21b713dabd6e9e1327156..54b44ad9895716dcb63022d5ff8732ee758197da 100644
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
@@ -372,7 +372,7 @@ TEST_F(WebPluginContainerTest, CopyFromContextMenu) {
event.clickCount = 1;
// Make sure the right-click + Copy works in common scenario.
- webView->handleInputEvent(event);
+ webView->handleInputEvent(WebCoalescedInputEvent(event));
EXPECT_TRUE(webView->mainFrame()->toWebLocalFrame()->executeCommand("Copy"));
EXPECT_EQ(WebString("x"), Platform::current()->clipboard()->readPlainText(
WebClipboard::Buffer()));
@@ -384,7 +384,7 @@ TEST_F(WebPluginContainerTest, CopyFromContextMenu) {
// Now, let's try a more complex scenario:
// 1) open the context menu. This will focus the plugin.
- webView->handleInputEvent(event);
+ webView->handleInputEvent(WebCoalescedInputEvent(event));
// 2) document blurs the plugin, because it can.
webView->clearFocusedElement();
// 3) Copy should still operate on the context node, even though the focus had
@@ -508,7 +508,7 @@ TEST_F(WebPluginContainerTest, GestureLongPressReachesPlugin) {
event.x = 0;
event.y = 0;
- webView->handleInputEvent(event);
+ webView->handleInputEvent(WebCoalescedInputEvent(event));
runPendingTasks();
EXPECT_EQ(WebInputEvent::Undefined, testPlugin->getLastInputEventType());
@@ -519,7 +519,7 @@ TEST_F(WebPluginContainerTest, GestureLongPressReachesPlugin) {
event.x = rect.x + rect.width / 2;
event.y = rect.y + rect.height / 2;
- webView->handleInputEvent(event);
+ webView->handleInputEvent(WebCoalescedInputEvent(event));
runPendingTasks();
EXPECT_EQ(WebInputEvent::GestureLongPress,
@@ -557,7 +557,7 @@ TEST_F(WebPluginContainerTest, MouseWheelEventTranslated) {
event.x = rect.x + rect.width / 2;
event.y = rect.y + rect.height / 2;
- webView->handleInputEvent(event);
+ webView->handleInputEvent(WebCoalescedInputEvent(event));
runPendingTasks();
EXPECT_EQ(WebInputEvent::MouseWheel, testPlugin->getLastInputEventType());
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698