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

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: ordering 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
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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 void OnGetSavableResourceLinks(); 792 void OnGetSavableResourceLinks();
793 void OnGetSerializedHtmlWithLocalLinks( 793 void OnGetSerializedHtmlWithLocalLinks(
794 const std::map<GURL, base::FilePath>& url_to_local_path, 794 const std::map<GURL, base::FilePath>& url_to_local_path,
795 const std::map<int, base::FilePath>& frame_routing_id_to_local_path); 795 const std::map<int, base::FilePath>& frame_routing_id_to_local_path);
796 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params); 796 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params);
797 void OnFind(int request_id, 797 void OnFind(int request_id,
798 const base::string16& search_text, 798 const base::string16& search_text,
799 const blink::WebFindOptions& options); 799 const blink::WebFindOptions& options);
800 void OnStopFinding(StopFindAction action); 800 void OnStopFinding(StopFindAction action);
801 void OnEnableViewSourceMode(); 801 void OnEnableViewSourceMode();
802 void OnSuppressDialogsUntilSwapOut();
802 #if defined(OS_ANDROID) 803 #if defined(OS_ANDROID)
803 void OnActivateNearestFindResult(int request_id, float x, float y); 804 void OnActivateNearestFindResult(int request_id, float x, float y);
804 void OnFindMatchRects(int current_version); 805 void OnFindMatchRects(int current_version);
805 void OnSelectPopupMenuItems(bool canceled, 806 void OnSelectPopupMenuItems(bool canceled,
806 const std::vector<int>& selected_indices); 807 const std::vector<int>& selected_indices);
807 #elif defined(OS_MACOSX) 808 #elif defined(OS_MACOSX)
808 void OnSelectPopupMenuItem(int selected_index); 809 void OnSelectPopupMenuItem(int selected_index);
809 void OnCopyToFindPboard(); 810 void OnCopyToFindPboard();
810 #endif 811 #endif
811 812
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 // Manages play, pause notifications for WebMediaPlayer implementations; its 1198 // Manages play, pause notifications for WebMediaPlayer implementations; its
1198 // lifetime is tied to the RenderFrame via the RenderFrameObserver interface. 1199 // lifetime is tied to the RenderFrame via the RenderFrameObserver interface.
1199 media::RendererWebMediaPlayerDelegate* media_player_delegate_; 1200 media::RendererWebMediaPlayerDelegate* media_player_delegate_;
1200 1201
1201 // Whether or not this RenderFrame is using Lo-Fi mode. 1202 // Whether or not this RenderFrame is using Lo-Fi mode.
1202 bool is_using_lofi_; 1203 bool is_using_lofi_;
1203 1204
1204 // Whether or not this RenderFrame is currently pasting. 1205 // Whether or not this RenderFrame is currently pasting.
1205 bool is_pasting_; 1206 bool is_pasting_;
1206 1207
1208 // Whether we must stop creating nested message loops for modal dialogs until
1209 // OnSwapOut is called. This is necessary because modal dialogs have a
1210 // PageGroupLoadDeferrer on the stack that interferes with swapping out.
1211 bool suppress_dialogs_until_swap_out_;
1212
1207 #if defined(ENABLE_WEBVR) 1213 #if defined(ENABLE_WEBVR)
1208 // The VR dispatcher attached to the frame, lazily initialized. 1214 // The VR dispatcher attached to the frame, lazily initialized.
1209 scoped_ptr<VRDispatcher> vr_dispatcher_; 1215 scoped_ptr<VRDispatcher> vr_dispatcher_;
1210 #endif 1216 #endif
1211 1217
1212 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1218 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1213 // The external popup for the currently showing select popup. 1219 // The external popup for the currently showing select popup.
1214 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 1220 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
1215 #endif 1221 #endif
1216 1222
1217 FrameBlameContext* blame_context_; // Not owned. 1223 FrameBlameContext* blame_context_; // Not owned.
1218 1224
1219 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1225 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1220 1226
1221 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1227 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1222 }; 1228 };
1223 1229
1224 } // namespace content 1230 } // namespace content
1225 1231
1226 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1232 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698