summaryrefslogtreecommitdiffstats
path: root/o3d/plugin
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 21:00:49 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 21:00:49 +0000
commita8c5c64971b1da3d515b515905383e2031f14039 (patch)
tree0b24a6672c4426bbc8c24ecabcdec7a80d47d55d /o3d/plugin
parent6eac1b3e62b46946670e89bc259796b61b01d251 (diff)
downloadchromium_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
Diffstat (limited to 'o3d/plugin')
-rw-r--r--o3d/plugin/cross/o3d_glue.cc3
1 files changed, 3 insertions, 0 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