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

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

Issue 598483002: Fix WeakPtrFactory member ordering in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved unittest regression issues Created 6 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 | « content/renderer/pepper/pepper_media_stream_audio_track_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_plugin_instance_impl.h
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h
index 2c7884e7d19ded4b7e2fed60be4f63fbb65532ec..00fb8e2270b6c6e22d451f4cb76ed594d37894ce 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.h
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -915,6 +915,8 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
bool is_tracking_latency_;
+ friend class PpapiPluginInstanceTest;
Avi (use Gerrit) 2014/09/24 15:33:10 According to the style guide, friends are the firs
MRV 2014/09/25 03:07:28 Done.
+
// We use a weak ptr factory for scheduling DidChangeView events so that we
// can tell whether updates are pending and consolidate them. When there's
// already a weak ptr pending (HasWeakPtrs is true), code should update the
@@ -923,7 +925,6 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
- friend class PpapiPluginInstanceTest;
DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
};
« no previous file with comments | « content/renderer/pepper/pepper_media_stream_audio_track_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698