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

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

Issue 1130233002: Convert main_render_frame_ to raw pointer in RenderViewImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on nick@'s review. Created 5 years, 7 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 | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_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_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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); 550 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
551 #endif 551 #endif
552 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset); 552 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset);
553 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit); 553 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit);
554 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 554 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
555 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 555 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
556 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 556 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
557 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 557 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
558 MessageOrderInDidChangeSelection); 558 MessageOrderInDidChangeSelection);
559 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 559 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
560 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose);
560 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses); 561 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, Suppresses);
561 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress); 562 FRIEND_TEST_ALL_PREFIXES(SuppressErrorPageTest, DoesNotSuppress);
562 563
563 typedef std::map<GURL, double> HostZoomLevels; 564 typedef std::map<GURL, double> HostZoomLevels;
564 565
565 enum ErrorPageType { 566 enum ErrorPageType {
566 DNS_ERROR, 567 DNS_ERROR,
567 HTTP_404, 568 HTTP_404,
568 CONNECTION_ERROR, 569 CONNECTION_ERROR,
569 }; 570 };
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 // states for the sizes). 902 // states for the sizes).
902 base::OneShotTimer<RenderViewImpl> check_preferred_size_timer_; 903 base::OneShotTimer<RenderViewImpl> check_preferred_size_timer_;
903 904
904 // Bookkeeping to suppress redundant scroll and focus requests for an already 905 // Bookkeeping to suppress redundant scroll and focus requests for an already
905 // scrolled and focused editable node. 906 // scrolled and focused editable node.
906 bool has_scrolled_focused_editable_node_into_rect_; 907 bool has_scrolled_focused_editable_node_into_rect_;
907 gfx::Rect rect_for_scrolled_focused_editable_node_; 908 gfx::Rect rect_for_scrolled_focused_editable_node_;
908 909
909 // Helper objects ------------------------------------------------------------ 910 // Helper objects ------------------------------------------------------------
910 911
911 scoped_ptr<RenderFrameImpl> main_render_frame_; 912 RenderFrameImpl* main_render_frame_;
912 913
913 // The next group of objects all implement RenderViewObserver, so are deleted 914 // The next group of objects all implement RenderViewObserver, so are deleted
914 // along with the RenderView automatically. This is why we just store 915 // along with the RenderView automatically. This is why we just store
915 // weak references. 916 // weak references.
916 917
917 // The speech recognition dispatcher attached to this view, lazily 918 // The speech recognition dispatcher attached to this view, lazily
918 // initialized. 919 // initialized.
919 SpeechRecognitionDispatcher* speech_recognition_dispatcher_; 920 SpeechRecognitionDispatcher* speech_recognition_dispatcher_;
920 921
921 // Mouse Lock dispatcher attached to this view. 922 // Mouse Lock dispatcher attached to this view.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 // use the Observer interface to filter IPC messages and receive frame change 1023 // use the Observer interface to filter IPC messages and receive frame change
1023 // notifications. 1024 // notifications.
1024 // --------------------------------------------------------------------------- 1025 // ---------------------------------------------------------------------------
1025 1026
1026 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1027 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1027 }; 1028 };
1028 1029
1029 } // namespace content 1030 } // namespace content
1030 1031
1031 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1032 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698