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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 112203003: Fix renderer crashes when frame gets detached while injectng user scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Defer frame destruction until event loop. Created 6 years, 9 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
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_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune); 791 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune);
792 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit); 792 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit);
793 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 793 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
794 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 794 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
795 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 795 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
796 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 796 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
797 MessageOrderInDidChangeSelection); 797 MessageOrderInDidChangeSelection);
798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
799 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses); 799 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses);
800 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress); 800 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress);
801 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest,
802 DynamicallyInsertedFrame);
803 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest, StaticFrame);
dcheng 2014/02/26 19:37:23 Are these friend declarations needed? I don't see
801 804
802 typedef std::map<GURL, double> HostZoomLevels; 805 typedef std::map<GURL, double> HostZoomLevels;
803 806
804 enum ErrorPageType { 807 enum ErrorPageType {
805 DNS_ERROR, 808 DNS_ERROR,
806 HTTP_404, 809 HTTP_404,
807 CONNECTION_ERROR, 810 CONNECTION_ERROR,
808 }; 811 };
809 812
810 static bool IsReload(const FrameMsg_Navigate_Params& params); 813 static bool IsReload(const FrameMsg_Navigate_Params& params);
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 // use the Observer interface to filter IPC messages and receive frame change 1470 // use the Observer interface to filter IPC messages and receive frame change
1468 // notifications. 1471 // notifications.
1469 // --------------------------------------------------------------------------- 1472 // ---------------------------------------------------------------------------
1470 1473
1471 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1474 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1472 }; 1475 };
1473 1476
1474 } // namespace content 1477 } // namespace content
1475 1478
1476 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1479 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698