Commit 352bb450 authored by mohan.reddy's avatar mohan.reddy Committed by Commit bot

Refactoring the order of the weak_ptr_factory in chrome/renderer folder

Changing in the intialization order of WeakPtrFactory such that all
member variables should appear before the WeakPtrFactory to ensure
that any WeakPtrs to Controller are invalidated before its members
variable's destructors are executed, rendering them invalid.

BUG=303818

Review URL: https://codereview.chromium.org/569233002

Cr-Commit-Position: refs/heads/master@{#294861}
parent d10b46af
......@@ -85,8 +85,6 @@ class CastStreamingNativeHandler : public ObjectBackedNativeHandler {
typedef std::map<int, linked_ptr<CastUdpTransport> > UdpTransportMap;
UdpTransportMap udp_transport_map_;
base::WeakPtrFactory<CastStreamingNativeHandler> weak_factory_;
extensions::ScopedPersistent<v8::Function> create_callback_;
typedef std::map<int,
......@@ -95,6 +93,8 @@ class CastStreamingNativeHandler : public ObjectBackedNativeHandler {
RtpStreamCallbackMap get_raw_events_callbacks_;
RtpStreamCallbackMap get_stats_callbacks_;
base::WeakPtrFactory<CastStreamingNativeHandler> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(CastStreamingNativeHandler);
};
......
......@@ -159,10 +159,11 @@ class CastRtpStream {
scoped_ptr<CastAudioSink> audio_sink_;
scoped_ptr<CastVideoSink> video_sink_;
CastRtpParams params_;
base::WeakPtrFactory<CastRtpStream> weak_factory_;
base::Closure stop_callback_;
ErrorCallback error_callback_;
base::WeakPtrFactory<CastRtpStream> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(CastRtpStream);
};
......
......@@ -459,13 +459,15 @@ class PrintWebViewHelper
PrintPreviewContext print_preview_context_;
bool is_loading_;
bool is_scripted_preview_delayed_;
base::WeakPtrFactory<PrintWebViewHelper> weak_ptr_factory_;
// Used to fix a race condition where the source is a PDF and print preview
// hangs because RequestPrintPreview is called before DidStopLoading() is
// called. This is a store for the RequestPrintPreview() call and its
// parameters so that it can be invoked after DidStopLoading.
base::Closure on_stop_loading_closure_;
base::WeakPtrFactory<PrintWebViewHelper> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
};
......
......@@ -81,12 +81,12 @@ TranslateHelper::TranslateHelper(content::RenderView* render_view)
: content::RenderViewObserver(render_view),
page_seq_no_(0),
translation_pending_(false),
weak_method_factory_(this),
cld_data_provider_(translate::CreateRendererCldDataProviderFor(this)),
cld_data_polling_started_(false),
cld_data_polling_canceled_(false),
deferred_page_capture_(false),
deferred_page_seq_no_(-1) {
deferred_page_seq_no_(-1),
weak_method_factory_(this) {
}
TranslateHelper::~TranslateHelper() {
......
......@@ -238,9 +238,6 @@ class TranslateHelper : public content::RenderViewObserver {
// time from showing infobar to requesting translation.
base::TimeTicks language_determined_time_;
// Method factory used to make calls to TranslatePageImpl.
base::WeakPtrFactory<TranslateHelper> weak_method_factory_;
// Provides CLD data for this process.
scoped_ptr<translate::RendererCldDataProvider> cld_data_provider_;
......@@ -262,6 +259,9 @@ class TranslateHelper : public content::RenderViewObserver {
// deferred_page_capture_ is true.
base::string16 deferred_contents_;
// Method factory used to make calls to TranslatePageImpl.
base::WeakPtrFactory<TranslateHelper> weak_method_factory_;
DISALLOW_COPY_AND_ASSIGN(TranslateHelper);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment