diff options
Diffstat (limited to 'chromium/content/renderer/pepper/message_channel.h')
| -rw-r--r-- | chromium/content/renderer/pepper/message_channel.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/chromium/content/renderer/pepper/message_channel.h b/chromium/content/renderer/pepper/message_channel.h index 9c8c28df3c4..e4e14233593 100644 --- a/chromium/content/renderer/pepper/message_channel.h +++ b/chromium/content/renderer/pepper/message_channel.h @@ -10,15 +10,12 @@ #include "base/memory/weak_ptr.h" #include "ppapi/shared_impl/resource.h" +#include "ppapi/shared_impl/scoped_pp_var.h" #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" #include "third_party/npapi/bindings/npruntime.h" struct PP_Var; -namespace ppapi { -class ScopedPPVar; -} - namespace content { class PepperPluginInstanceImpl; @@ -86,7 +83,18 @@ class MessageChannel { private: // Struct for storing the result of a NPVariant being converted to a PP_Var. - struct VarConversionResult; + struct VarConversionResult { + VarConversionResult(const ppapi::ScopedPPVar& r, bool s) + : result(r), + success(s), + conversion_completed(true) {} + VarConversionResult() + : success(false), + conversion_completed(false) {} + ppapi::ScopedPPVar result; + bool success; + bool conversion_completed; + }; // This is called when an NPVariant is finished being converted. // |result_iteartor| is an iterator into |converted_var_queue_| where the |