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

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: Make sure FrameScheduler is cleared when LocalFrame::detach() is done 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
« no previous file with comments | « no previous file | 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 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 // callback, and the remaining elements are the other file chooser completion 1250 // callback, and the remaining elements are the other file chooser completion
1251 // still waiting to be run (in order). 1251 // still waiting to be run (in order).
1252 struct PendingFileChooser; 1252 struct PendingFileChooser;
1253 std::deque<std::unique_ptr<PendingFileChooser>> file_chooser_completions_; 1253 std::deque<std::unique_ptr<PendingFileChooser>> file_chooser_completions_;
1254 1254
1255 #if defined(USE_EXTERNAL_POPUP_MENU) 1255 #if defined(USE_EXTERNAL_POPUP_MENU)
1256 // The external popup for the currently showing select popup. 1256 // The external popup for the currently showing select popup.
1257 std::unique_ptr<ExternalPopupMenu> external_popup_menu_; 1257 std::unique_ptr<ExternalPopupMenu> external_popup_menu_;
1258 #endif 1258 #endif
1259 1259
1260 FrameBlameContext* blame_context_; // Not owned. 1260 std::unique_ptr<FrameBlameContext> blame_context_;
1261 1261
1262 // Plugins ------------------------------------------------------------------- 1262 // Plugins -------------------------------------------------------------------
1263 #if defined(ENABLE_PLUGINS) 1263 #if defined(ENABLE_PLUGINS)
1264 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet; 1264 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
1265 PepperPluginSet active_pepper_instances_; 1265 PepperPluginSet active_pepper_instances_;
1266 1266
1267 // Whether or not the focus is on a PPAPI plugin 1267 // Whether or not the focus is on a PPAPI plugin
1268 PepperPluginInstanceImpl* focused_pepper_plugin_; 1268 PepperPluginInstanceImpl* focused_pepper_plugin_;
1269 1269
1270 // The plugin instance that received the last mouse event. It is set to NULL 1270 // The plugin instance that received the last mouse event. It is set to NULL
1271 // if the last mouse event went to elements other than Pepper plugins. 1271 // if the last mouse event went to elements other than Pepper plugins.
1272 // |pepper_last_mouse_event_target_| is not owned by this class. We depend on 1272 // |pepper_last_mouse_event_target_| is not owned by this class. We depend on
1273 // the RenderFrameImpl to NULL it out when it destructs. 1273 // the RenderFrameImpl to NULL it out when it destructs.
1274 PepperPluginInstanceImpl* pepper_last_mouse_event_target_; 1274 PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
1275 #endif 1275 #endif
1276 1276
1277 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1277 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1278 1278
1279 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1279 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1280 }; 1280 };
1281 1281
1282 } // namespace content 1282 } // namespace content
1283 1283
1284 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1284 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698