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

Unified Diff: content/renderer/render_view_impl.cc

Issue 12298022: Don't store the DateTimePicker client in a scoped_ptr. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3b1a0d3ed68a1126d77182272b9d272a1fd33d8c..55702cfd2f8689f0059266657fd0e5cc4adece6d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -806,6 +806,12 @@ RenderViewImpl::~RenderViewImpl() {
file_chooser_completions_.pop_front();
}
+#if defined(OS_ANDROID)
+ // The date/time picker client is both a scoped_ptr member of this class and
+ // a RenderViewObserver. Reset it to prevent double deletion.
+ date_time_picker_client_.reset();
+#endif
+
#if defined(OS_MACOSX)
// Destroy all fake plugin window handles on the browser side.
while (!fake_plugin_window_handles_.empty()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698