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

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

Issue 2053233002: Make sure FrameScheduler is cleared when LocalFrame::detach() finishes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 // Whether we must stop creating nested message loops for modal dialogs. This 1226 // Whether we must stop creating nested message loops for modal dialogs. This
1227 // is necessary because modal dialogs have a ScopedPageLoadDeferrer on the 1227 // is necessary because modal dialogs have a ScopedPageLoadDeferrer on the
1228 // stack that interferes with swapping out. 1228 // stack that interferes with swapping out.
1229 bool suppress_further_dialogs_; 1229 bool suppress_further_dialogs_;
1230 1230
1231 #if defined(USE_EXTERNAL_POPUP_MENU) 1231 #if defined(USE_EXTERNAL_POPUP_MENU)
1232 // The external popup for the currently showing select popup. 1232 // The external popup for the currently showing select popup.
1233 std::unique_ptr<ExternalPopupMenu> external_popup_menu_; 1233 std::unique_ptr<ExternalPopupMenu> external_popup_menu_;
1234 #endif 1234 #endif
1235 1235
1236 FrameBlameContext* blame_context_; // Not owned. 1236 std::unique_ptr<FrameBlameContext> blame_context_;
1237 1237
1238 // Plugins ------------------------------------------------------------------- 1238 // Plugins -------------------------------------------------------------------
1239 #if defined(ENABLE_PLUGINS) 1239 #if defined(ENABLE_PLUGINS)
1240 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet; 1240 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
1241 PepperPluginSet active_pepper_instances_; 1241 PepperPluginSet active_pepper_instances_;
1242 1242
1243 // Whether or not the focus is on a PPAPI plugin 1243 // Whether or not the focus is on a PPAPI plugin
1244 PepperPluginInstanceImpl* focused_pepper_plugin_; 1244 PepperPluginInstanceImpl* focused_pepper_plugin_;
1245 1245
1246 // The plugin instance that received the last mouse event. It is set to NULL 1246 // The plugin instance that received the last mouse event. It is set to NULL
1247 // if the last mouse event went to elements other than Pepper plugins. 1247 // if the last mouse event went to elements other than Pepper plugins.
1248 // |pepper_last_mouse_event_target_| is not owned by this class. We depend on 1248 // |pepper_last_mouse_event_target_| is not owned by this class. We depend on
1249 // the RenderFrameImpl to NULL it out when it destructs. 1249 // the RenderFrameImpl to NULL it out when it destructs.
1250 PepperPluginInstanceImpl* pepper_last_mouse_event_target_; 1250 PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
1251 #endif 1251 #endif
1252 1252
1253 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1253 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1254 1254
1255 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1255 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1256 }; 1256 };
1257 1257
1258 } // namespace content 1258 } // namespace content
1259 1259
1260 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1260 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698