Index: webkit/plugins/ppapi/ppapi_webplugin_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppapi_webplugin_impl.cc (revision 77426) |
+++ webkit/plugins/ppapi/ppapi_webplugin_impl.cc (working copy) |
@@ -12,6 +12,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
+#include "webkit/plugins/ppapi/message_channel.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
#include "webkit/plugins/ppapi/ppb_url_loader_impl.h" |
@@ -90,8 +91,11 @@ |
NPObject* WebPluginImpl::scriptableObject() { |
scoped_refptr<ObjectVar> object( |
ObjectVar::FromPPVar(instance_->GetInstanceObject())); |
- if (object) |
- return object->np_object(); |
+ if (object) { |
+ instance_-> |
brettw
2011/03/16 21:34:11
I'd probably have wrapped this like:
instance_->me
|
+ message_channel().set_passthrough_object(object->np_object()); |
+ } |
+ return instance_->message_channel().np_object(); |
return NULL; |
} |