Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Unified Diff: o3d/gpu_plugin/gpu_plugin_object.cc

Issue 196032: Replaced BaseNPObject with DefaultNPObject because...... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « o3d/gpu_plugin/gpu_plugin_object.h ('k') | o3d/gpu_plugin/gpu_plugin_object_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: o3d/gpu_plugin/gpu_plugin_object.cc
===================================================================
--- o3d/gpu_plugin/gpu_plugin_object.cc (revision 25348)
+++ o3d/gpu_plugin/gpu_plugin_object.cc (working copy)
@@ -5,6 +5,7 @@
#include <stdlib.h>
#include "base/logging.h"
+#include "o3d/gpu_plugin/np_utils/np_utils.h"
#include "o3d/gpu_plugin/gpu_plugin_object.h"
namespace o3d {
@@ -18,7 +19,7 @@
"application/vnd.google.chrome.gpu-plugin";
GPUPluginObject::GPUPluginObject(NPP npp)
- : DispatchedNPObject(npp),
+ : npp_(npp),
status_(CREATED),
shared_memory_(NULL) {
memset(&window_, 0, sizeof(window_));
@@ -60,7 +61,7 @@
return NPERR_GENERIC_ERROR;
if (shared_memory_) {
- NPBrowser::get()->UnmapSharedMemory(npp(), shared_memory_);
+ NPBrowser::get()->UnmapSharedMemory(npp_, shared_memory_);
}
command_buffer_object_ = NPObjectPointer<CommandBuffer>();
@@ -84,7 +85,7 @@
if (command_buffer_object_.Get())
return command_buffer_object_;
- command_buffer_object_ = NPCreateObject<CommandBuffer>(npp());
+ command_buffer_object_ = NPCreateObject<CommandBuffer>(npp_);
if (!command_buffer_object_->Initialize(kCommandBufferSize)) {
command_buffer_object_ = NPObjectPointer<CommandBuffer>();
}
« no previous file with comments | « o3d/gpu_plugin/gpu_plugin_object.h ('k') | o3d/gpu_plugin/gpu_plugin_object_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698