diff options
author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 17:23:57 +0000 |
---|---|---|
committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 17:23:57 +0000 |
commit | 53e7aab17f5d57ef3419ba70632caf65de52cda3 (patch) | |
tree | 90f5f3dfb8687b7671a62ea7b9a83f4e12a2b25c /o3d/gpu_plugin/gpu_plugin_object.h | |
parent | 0ec5ff993e5b3f90d84e8dee2d5b90590482737a (diff) | |
download | chromium_src-53e7aab17f5d57ef3419ba70632caf65de52cda3.zip chromium_src-53e7aab17f5d57ef3419ba70632caf65de52cda3.tar.gz chromium_src-53e7aab17f5d57ef3419ba70632caf65de52cda3.tar.bz2 |
Implemented shared memory as an NPObject. Using NPObject method to expose mapping function rather than NPAPI change.
Note that shared memory objects currently lose identity when they cross a process boundary. If an object is sent across a boundary and back, there are now two objects representing the same handle in a single process. This can be fixed.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/194049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/gpu_plugin/gpu_plugin_object.h')
-rw-r--r-- | o3d/gpu_plugin/gpu_plugin_object.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/o3d/gpu_plugin/gpu_plugin_object.h b/o3d/gpu_plugin/gpu_plugin_object.h index 38b684b..0ca11e3 100644 --- a/o3d/gpu_plugin/gpu_plugin_object.h +++ b/o3d/gpu_plugin/gpu_plugin_object.h @@ -8,7 +8,7 @@ #include <string> #include "o3d/gpu_plugin/command_buffer.h" -#include "o3d/gpu_plugin/np_utils/dispatched_np_object.h" +#include "o3d/gpu_plugin/np_utils/default_np_object.h" #include "o3d/gpu_plugin/np_utils/np_dispatcher.h" #include "o3d/gpu_plugin/np_utils/np_plugin_object.h" #include "o3d/gpu_plugin/np_utils/np_utils.h" @@ -63,7 +63,6 @@ class GPUPluginObject : public DefaultNPObject<NPObject>, Status status_; NPWindow window_; NPObjectPointer<CommandBuffer> command_buffer_object_; - NPSharedMemory* shared_memory_; }; } // namespace gpu_plugin |