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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 908
909 bool is_deleted_; 909 bool is_deleted_;
910 910
911 // The text that is currently selected in the plugin. 911 // The text that is currently selected in the plugin.
912 base::string16 selected_text_; 912 base::string16 selected_text_;
913 913
914 int64 last_input_number_; 914 int64 last_input_number_;
915 915
916 bool is_tracking_latency_; 916 bool is_tracking_latency_;
917 917
918 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.
919
918 // We use a weak ptr factory for scheduling DidChangeView events so that we 920 // We use a weak ptr factory for scheduling DidChangeView events so that we
919 // can tell whether updates are pending and consolidate them. When there's 921 // can tell whether updates are pending and consolidate them. When there's
920 // already a weak ptr pending (HasWeakPtrs is true), code should update the 922 // already a weak ptr pending (HasWeakPtrs is true), code should update the
921 // view_data_ but not send updates. This also allows us to cancel scheduled 923 // view_data_ but not send updates. This also allows us to cancel scheduled
922 // view change events. 924 // view change events.
923 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_; 925 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
924 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_; 926 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
925 927
926 friend class PpapiPluginInstanceTest;
927 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl); 928 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
928 }; 929 };
929 930
930 } // namespace content 931 } // namespace content
931 932
932 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 933 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
OLDNEW
« 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