summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranujk.sharma <anujk.sharma@samsung.com>2014-09-22 10:42:03 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 17:42:15 +0000
commitdfefffa1cd3d8de20392e55bb66168c1505312d5 (patch)
tree5a283e3e655eaaac314acfa5063926c64def8bf7
parent9e63b3f6d6cbdbdccc5d35bc3809254178e715dd (diff)
downloadchromium_src-dfefffa1cd3d8de20392e55bb66168c1505312d5.zip
chromium_src-dfefffa1cd3d8de20392e55bb66168c1505312d5.tar.gz
chromium_src-dfefffa1cd3d8de20392e55bb66168c1505312d5.tar.bz2
Fix WeakPtrFactory member placement
Changing in the intialization order of WeakPtrFactory in src/chrome/browser module 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/582633002 Cr-Commit-Position: refs/heads/master@{#296007}
-rw-r--r--content/browser/frame_host/interstitial_page_impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h
index 1305eea..e4c46d2 100644
--- a/content/browser/frame_host/interstitial_page_impl.h
+++ b/content/browser/frame_host/interstitial_page_impl.h
@@ -282,10 +282,10 @@ class CONTENT_EXPORT InterstitialPageImpl
scoped_ptr<InterstitialPageDelegate> delegate_;
- base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
-
scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
+ base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
};