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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.h

Issue 538883002: Speculative fix for DelegatedFrameHost destructor crashes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Absolutely minimal fix 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 | « no previous file | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 int increment_in_flight_event_count() { return ++in_flight_event_count_; } 553 int increment_in_flight_event_count() { return ++in_flight_event_count_; }
554 int decrement_in_flight_event_count() { return --in_flight_event_count_; } 554 int decrement_in_flight_event_count() { return --in_flight_event_count_; }
555 555
556 // The View associated with the RenderViewHost. The lifetime of this object 556 // The View associated with the RenderViewHost. The lifetime of this object
557 // is associated with the lifetime of the Render process. If the Renderer 557 // is associated with the lifetime of the Render process. If the Renderer
558 // crashes, its View is destroyed and this pointer becomes NULL, even though 558 // crashes, its View is destroyed and this pointer becomes NULL, even though
559 // render_view_host_ lives on to load another URL (creating a new View while 559 // render_view_host_ lives on to load another URL (creating a new View while
560 // doing so). 560 // doing so).
561 RenderWidgetHostViewBase* view_; 561 RenderWidgetHostViewBase* view_;
562 562
563 // A weak pointer to the view. The above pointer should be weak, but changing
564 // that to be weak causes crashes on Android.
565 // TODO(ccameron): Fix this.
566 // http://crbug.com/404828
567 base::WeakPtr<RenderWidgetHostViewBase> view_weak_;
568
563 // true if a renderer has once been valid. We use this flag to display a sad 569 // true if a renderer has once been valid. We use this flag to display a sad
564 // tab only when we lose our renderer and not if a paint occurs during 570 // tab only when we lose our renderer and not if a paint occurs during
565 // initialization. 571 // initialization.
566 bool renderer_initialized_; 572 bool renderer_initialized_;
567 573
568 // This value indicates how long to wait before we consider a renderer hung. 574 // This value indicates how long to wait before we consider a renderer hung.
569 int hung_renderer_delay_ms_; 575 int hung_renderer_delay_ms_;
570 576
571 private: 577 private:
572 friend class MockRenderWidgetHost; 578 friend class MockRenderWidgetHost;
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 typedef std::map<int, 845 typedef std::map<int,
840 base::Callback<void(const unsigned char*, size_t)> > PendingSnapshotMap; 846 base::Callback<void(const unsigned char*, size_t)> > PendingSnapshotMap;
841 PendingSnapshotMap pending_browser_snapshots_; 847 PendingSnapshotMap pending_browser_snapshots_;
842 848
843 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl); 849 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
844 }; 850 };
845 851
846 } // namespace content 852 } // namespace content
847 853
848 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_ 854 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698