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

Unified Diff: content/renderer/pepper/message_channel.h

Issue 26727006: Revert 227566 "Fix some WeakPtrFactory members that aren't last" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1672/src/
Patch Set: Created 7 years, 2 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 | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | content/renderer/pepper/message_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | content/renderer/pepper/message_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698