diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 21:00:49 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 21:00:49 +0000 |
| commit | a8c5c64971b1da3d515b515905383e2031f14039 (patch) | |
| tree | 0b24a6672c4426bbc8c24ecabcdec7a80d47d55d | |
| parent | 6eac1b3e62b46946670e89bc259796b61b01d251 (diff) | |
| download | chromium_src-a8c5c64971b1da3d515b515905383e2031f14039.zip chromium_src-a8c5c64971b1da3d515b515905383e2031f14039.tar.gz chromium_src-a8c5c64971b1da3d515b515905383e2031f14039.tar.bz2 | |
Disabled a couple of selenium tests that don't work in Chrome (see comment). Set some members to NULL when Client::TearDown.
Review URL: http://codereview.chromium.org/147185
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19655 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/plugin/cross/o3d_glue.cc | 3 | ||||
| -rw-r--r-- | o3d/tests/selenium/javascript_unit_test_list.txt | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc index 8be6c18..d064f00 100644 --- a/o3d/plugin/cross/o3d_glue.cc +++ b/o3d/plugin/cross/o3d_glue.cc @@ -215,10 +215,13 @@ void PluginObject::TearDown() { stream_manager_.reset(NULL); delete client_; + client_ = NULL; + // Release the graphics context before deletion. DeleteRenderer(); delete features_; + features_ = NULL; // There is a reference cycle between the V8 bridge and the plugin. // Explicitly remove all V8 references during tear-down, so that the cycle is diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt index 2a76932..7040da6 100644 --- a/o3d/tests/selenium/javascript_unit_test_list.txt +++ b/o3d/tests/selenium/javascript_unit_test_list.txt @@ -85,7 +85,9 @@ small effect-import-test # function to custom run the test. As such, only the 'except' and # pdiff_threshold options have any meaning -medium TestStressDrawShapes -medium TestStressMultiWindow -large TestStressCullingZSort pdiff_threshold(14100) +# These two tests rely on Selenium getting or setting a page's title and that +# does not currently work with Chrome. +medium TestStressDrawShapes except(*googlechrome) +medium TestStressMultiWindow except(*googlechrome) +large TestStressCullingZSort pdiff_threshold(14100) |