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

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: Added render view browser tests that perform synchronous frame removal on loading finished. Created 6 years, 11 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 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 797 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
799 ShouldUpdateSelectionTextFromContextMenuParams); 799 ShouldUpdateSelectionTextFromContextMenuParams);
800 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 800 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
801 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 801 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
803 MessageOrderInDidChangeSelection); 803 MessageOrderInDidChangeSelection);
804 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 804 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
805 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses); 805 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses);
806 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress); 806 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress);
807 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest,
808 DynamicallyInsertedFrame);
809 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest, StaticFrame);
807 810
808 typedef std::map<GURL, double> HostZoomLevels; 811 typedef std::map<GURL, double> HostZoomLevels;
809 812
810 enum ErrorPageType { 813 enum ErrorPageType {
811 DNS_ERROR, 814 DNS_ERROR,
812 HTTP_404, 815 HTTP_404,
813 CONNECTION_ERROR, 816 CONNECTION_ERROR,
814 }; 817 };
815 818
816 static blink::WebReferrerPolicy GetReferrerPolicyFromRequest( 819 static blink::WebReferrerPolicy GetReferrerPolicyFromRequest(
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 // use the Observer interface to filter IPC messages and receive frame change 1528 // use the Observer interface to filter IPC messages and receive frame change
1526 // notifications. 1529 // notifications.
1527 // --------------------------------------------------------------------------- 1530 // ---------------------------------------------------------------------------
1528 1531
1529 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1532 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1530 }; 1533 };
1531 1534
1532 } // namespace content 1535 } // namespace content
1533 1536
1534 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1537 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698