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

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

Issue 1849013004: Fix JavaScript alerts from frames with oopif on, after a cross-process click. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alertfix
Patch Set: fixes Created 4 years, 8 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/common/view_messages.h ('k') | content/renderer/render_frame_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 void OnGetSavableResourceLinks(); 794 void OnGetSavableResourceLinks();
795 void OnGetSerializedHtmlWithLocalLinks( 795 void OnGetSerializedHtmlWithLocalLinks(
796 const std::map<GURL, base::FilePath>& url_to_local_path, 796 const std::map<GURL, base::FilePath>& url_to_local_path,
797 const std::map<int, base::FilePath>& frame_routing_id_to_local_path); 797 const std::map<int, base::FilePath>& frame_routing_id_to_local_path);
798 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params); 798 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params);
799 void OnFind(int request_id, 799 void OnFind(int request_id,
800 const base::string16& search_text, 800 const base::string16& search_text,
801 const blink::WebFindOptions& options); 801 const blink::WebFindOptions& options);
802 void OnStopFinding(StopFindAction action); 802 void OnStopFinding(StopFindAction action);
803 void OnEnableViewSourceMode(); 803 void OnEnableViewSourceMode();
804 void OnSuppressFurtherDialogs();
804 #if defined(OS_ANDROID) 805 #if defined(OS_ANDROID)
805 void OnActivateNearestFindResult(int request_id, float x, float y); 806 void OnActivateNearestFindResult(int request_id, float x, float y);
806 void OnFindMatchRects(int current_version); 807 void OnFindMatchRects(int current_version);
807 void OnSelectPopupMenuItems(bool canceled, 808 void OnSelectPopupMenuItems(bool canceled,
808 const std::vector<int>& selected_indices); 809 const std::vector<int>& selected_indices);
809 #elif defined(OS_MACOSX) 810 #elif defined(OS_MACOSX)
810 void OnSelectPopupMenuItem(int selected_index); 811 void OnSelectPopupMenuItem(int selected_index);
811 void OnCopyToFindPboard(); 812 void OnCopyToFindPboard();
812 #endif 813 #endif
813 814
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 // Manages play, pause notifications for WebMediaPlayer implementations; its 1201 // Manages play, pause notifications for WebMediaPlayer implementations; its
1201 // lifetime is tied to the RenderFrame via the RenderFrameObserver interface. 1202 // lifetime is tied to the RenderFrame via the RenderFrameObserver interface.
1202 media::RendererWebMediaPlayerDelegate* media_player_delegate_; 1203 media::RendererWebMediaPlayerDelegate* media_player_delegate_;
1203 1204
1204 // Whether or not this RenderFrame is using Lo-Fi mode. 1205 // Whether or not this RenderFrame is using Lo-Fi mode.
1205 bool is_using_lofi_; 1206 bool is_using_lofi_;
1206 1207
1207 // Whether or not this RenderFrame is currently pasting. 1208 // Whether or not this RenderFrame is currently pasting.
1208 bool is_pasting_; 1209 bool is_pasting_;
1209 1210
1211 // Whether we must stop creating nested message loops for modal dialogs. This
1212 // is necessary because modal dialogs have a ScopedPageLoadDeferrer on the
1213 // stack that interferes with swapping out.
1214 bool suppress_further_dialogs_;
1215
1210 #if defined(ENABLE_WEBVR) 1216 #if defined(ENABLE_WEBVR)
1211 // The VR dispatcher attached to the frame, lazily initialized. 1217 // The VR dispatcher attached to the frame, lazily initialized.
1212 scoped_ptr<VRDispatcher> vr_dispatcher_; 1218 scoped_ptr<VRDispatcher> vr_dispatcher_;
1213 #endif 1219 #endif
1214 1220
1215 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1221 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1216 // The external popup for the currently showing select popup. 1222 // The external popup for the currently showing select popup.
1217 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 1223 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
1218 #endif 1224 #endif
1219 1225
1220 FrameBlameContext* blame_context_; // Not owned. 1226 FrameBlameContext* blame_context_; // Not owned.
1221 1227
1222 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1228 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1223 1229
1224 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1230 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1225 }; 1231 };
1226 1232
1227 } // namespace content 1233 } // namespace content
1228 1234
1229 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1235 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/common/view_messages.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698