diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-28 23:29:15 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-28 23:29:15 +0000 |
| commit | dd49900aefff27c2fbbec1f0f0464a5c57bbad0f (patch) | |
| tree | 9867a5f31d651f37b89ce92e1f3454e53a128a17 /chrome | |
| parent | 469bc0332a0b291960e394f3413ea5adaae71a05 (diff) | |
| download | chromium_src-dd49900aefff27c2fbbec1f0f0464a5c57bbad0f.zip chromium_src-dd49900aefff27c2fbbec1f0f0464a5c57bbad0f.tar.gz chromium_src-dd49900aefff27c2fbbec1f0f0464a5c57bbad0f.tar.bz2 | |
Revert r4094; ui_tests failures in SelfDeletePluginInvokeInSynchronousMouseMove.
Review URL: http://codereview.chromium.org/8861
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/data/npapi/execute_script_delete_in_mouse_move.html | 39 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cpp | 38 |
2 files changed, 1 insertions, 76 deletions
diff --git a/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html b/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html deleted file mode 100644 index a82cde7..0000000 --- a/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html +++ /dev/null @@ -1,39 +0,0 @@ -<html> - -<head> -<script src="npapi.js"></script> - -<script> -function DeletePluginWithinScript() { - var plugin_div = document.getElementById("PluginDiv"); - plugin_div.innerHTML = "Object Deleted"; - onSuccess("execute_script_delete_in_mouse_move", 1); -} -</script> -</head> - -<body> -<div id="statusPanel" style="border: 1px solid red; width: 100%"> -Test running.... -</div> - - -NPObject Proxy Test<p> - -Tests the case where a plugin instance is deleted in the context -of a synchronous mouse event. - -<DIV ID=PluginDiv> -<embed type="application/vnd.npapi-test" - src="foo" - name="execute_script_delete_in_mouse_move" - id="1" - mode="np_embed" -> -</DIV> -<script> - var height = document.body.offsetHeight; -</script> - -</body> -</html> diff --git a/chrome/test/ui/npapi_uitest.cpp b/chrome/test/ui/npapi_uitest.cpp index 58c6574..bce1497 100644 --- a/chrome/test/ui/npapi_uitest.cpp +++ b/chrome/test/ui/npapi_uitest.cpp @@ -279,40 +279,4 @@ TEST_F(NPAPIVisiblePluginTester, OpenPopupWindowWithPlugin) { WaitForFinish("plugin_popup_with_plugin_target", "1", url, kTestCompleteCookie, kTestCompleteSuccess, kShortWaitTimeout); -} - -// Tests if a plugin executing a self deleting script in the context of -// a synchronous mousemove works correctly -TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) { - if (!UITest::in_process_plugins() && !UITest::in_process_renderer()) { - scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); - HWND tab_window = NULL; - tab_proxy->GetHWND(&tab_window); - - EXPECT_TRUE(IsWindow(tab_window)); - - show_window_ = true; - std::wstring test_case = L"execute_script_delete_in_mouse_move.html"; - GURL url = GetTestUrl(L"npapi", test_case); - NavigateToURL(url); - - POINT cursor_position = {130, 130}; - ClientToScreen(tab_window, &cursor_position); - - double screen_width = ::GetSystemMetrics( SM_CXSCREEN ) - 1; - double screen_height = ::GetSystemMetrics( SM_CYSCREEN ) - 1; - double location_x = cursor_position.x * (65535.0f / screen_width); - double location_y = cursor_position.y * (65535.0f / screen_height); - - INPUT input_info = {0}; - input_info.type = INPUT_MOUSE; - input_info.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; - input_info.mi.dx = static_cast<long>(location_x); - input_info.mi.dy = static_cast<long>(location_y); - ::SendInput(1, &input_info, sizeof(INPUT)); - - WaitForFinish("execute_script_delete_in_mouse_move", "1", url, - kTestCompleteCookie, kTestCompleteSuccess, - kShortWaitTimeout); - } -} +}
\ No newline at end of file |