diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 20:46:37 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 20:46:37 +0000 |
| commit | 03f882aa62d925a6f27e9038f4f7235be55afe02 (patch) | |
| tree | 4f06e41eb249f8f9f335f292c35f27822221f636 /webkit | |
| parent | de049e2d0eab6145c2805de17ff838f58c14fdd3 (diff) | |
| download | chromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.zip chromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.tar.gz chromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.tar.bz2 | |
Fixed some bugs that prevented the GPU plugin from shutting down without crashing.
TEST=trybots
BUG=none
Review URL: http://codereview.chromium.org/529004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/pepper_test_plugin/plugin_object.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/tools/pepper_test_plugin/plugin_object.h b/webkit/tools/pepper_test_plugin/plugin_object.h index 4dcff15..a248f48 100644 --- a/webkit/tools/pepper_test_plugin/plugin_object.h +++ b/webkit/tools/pepper_test_plugin/plugin_object.h @@ -59,11 +59,9 @@ class PluginObject { NPDevice* device2d_; - // TODO(apatrick): this destruction order causes the plugin to crash on - // shutdown. scoped_ptr<CommandBufferPepper> command_buffer_; - scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_; scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_; + scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_; gfx::Size size_; |