| Index: content/renderer/pepper/message_channel.h
|
| ===================================================================
|
| --- content/renderer/pepper/message_channel.h (revision 228862)
|
| +++ content/renderer/pepper/message_channel.h (working copy)
|
| @@ -118,6 +118,10 @@
|
|
|
| void DrainEarlyMessageQueue();
|
|
|
| + // This is used to ensure pending tasks will not fire after this object is
|
| + // destroyed.
|
| + base::WeakPtrFactory<MessageChannel> weak_ptr_factory_;
|
| +
|
| // TODO(teravest): Remove all the tricky DRAIN_CANCELLED logic once
|
| // PluginInstance::ResetAsProxied() is gone.
|
| std::deque<WebKit::WebSerializedScriptValue> early_message_queue_;
|
| @@ -135,10 +139,6 @@
|
| // the order in which messages are processed is preserved.
|
| std::list<VarConversionResult> converted_var_queue_;
|
|
|
| - // This is used to ensure pending tasks will not fire after this object is
|
| - // destroyed.
|
| - base::WeakPtrFactory<MessageChannel> weak_ptr_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MessageChannel);
|
| };
|
|
|
|
|