summaryrefslogtreecommitdiffstats
path: root/chrome/SConscript.ui_tests
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-29 00:35:32 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-29 00:35:32 +0000
commitfce8e2fccb2fdb9ed1f52ab9701e5299cec63677 (patch)
tree83dbf1e38ae5eb063e7757e9ce21d6636563f503 /chrome/SConscript.ui_tests
parent7c2dbdd0bec7444f895082aed1b4d7b939867a17 (diff)
downloadchromium_src-fce8e2fccb2fdb9ed1f52ab9701e5299cec63677.zip
chromium_src-fce8e2fccb2fdb9ed1f52ab9701e5299cec63677.tar.gz
chromium_src-fce8e2fccb2fdb9ed1f52ab9701e5299cec63677.tar.bz2
Moved the SelfDeletePluginInvokeInSynchronousMouseMove to interactive ui tests
as we need to simulate mousemoves here. ui tests run on machines which are locked, causing this test to fail. Moved the NPAPITester and NPAPIVisiblePluginTester classes to a common file npapi_test_helper.cc so it can be used from both tests. Relanding the SetCursor patch. It has already been approved by John. Description below:- Proposed fix for http://b/issue?id=1362948, which is a crash in the rendererwhen we invoke the setCursor call on the parent view in WebPluginImpl::handleEvent. This crash occurs because the plugin is deleted in the context of a mouse down event. This could occur by invoking a javascript function via NPN_Evaluate. On return from the HandleEvent sync call we attempt to retreive the parent frame, which returns NULL and hence the crash. The fix is to retreive the parent frameview at the start of the WebPluginImpl::handleMouseEvent function and use it whereever needed. Added a unit test which deletes the plugin instance in a mousemove event. R=jam Bug=1362948 Review URL: http://codereview.chromium.org/8691 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.ui_tests')
-rw-r--r--chrome/SConscript.ui_tests1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 0c587b1..0443a4d 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -129,6 +129,7 @@ ui_test_files = [
'test/ui/ui_test.cc',
'test/ui/ui_test_suite.cc',
'test/ui/history_uitest.cc',
+ 'test/ui/npapi_test_helper.cc',
'$CHROME_DIR/test/test_file_util$OBJSUFFIX',
'$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
]