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

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: Updated patch to latest WebFrame/Frame lifetime changes. Created 6 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 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 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
803 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 803 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
804 ShouldUpdateSelectionTextFromContextMenuParams); 804 ShouldUpdateSelectionTextFromContextMenuParams);
805 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 805 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
806 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 806 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
807 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 807 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
808 MessageOrderInDidChangeSelection); 808 MessageOrderInDidChangeSelection);
809 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 809 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
810 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses); 810 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses);
811 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress); 811 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress);
812 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest,
813 DynamicallyInsertedFrame);
814 FRIEND_TEST_ALL_PREFIXES(SynchronousFrameRemovalOnLoadTest, StaticFrame);
812 815
813 typedef std::map<GURL, double> HostZoomLevels; 816 typedef std::map<GURL, double> HostZoomLevels;
814 817
815 enum ErrorPageType { 818 enum ErrorPageType {
816 DNS_ERROR, 819 DNS_ERROR,
817 HTTP_404, 820 HTTP_404,
818 CONNECTION_ERROR, 821 CONNECTION_ERROR,
819 }; 822 };
820 823
821 static void GetRedirectChain(blink::WebDataSource* ds, 824 static void GetRedirectChain(blink::WebDataSource* ds,
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
1507 // use the Observer interface to filter IPC messages and receive frame change 1510 // use the Observer interface to filter IPC messages and receive frame change
1508 // notifications. 1511 // notifications.
1509 // --------------------------------------------------------------------------- 1512 // ---------------------------------------------------------------------------
1510 1513
1511 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1514 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1512 }; 1515 };
1513 1516
1514 } // namespace content 1517 } // namespace content
1515 1518
1516 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1519 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698