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

Side by Side Diff: content/browser/devtools/render_frame_devtools_agent_host.h

Issue 2484793002: Remove access to WebContents in RWHVA::SynchronousFrameMetadata() (Closed)
Patch Set: comments Created 4 years, 1 month 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/browser/devtools/render_frame_devtools_agent_host.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_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 RenderFrameHost* current); 65 RenderFrameHost* current);
66 static void OnBeforeNavigation(RenderFrameHost* current, 66 static void OnBeforeNavigation(RenderFrameHost* current,
67 RenderFrameHost* pending); 67 RenderFrameHost* pending);
68 static void OnBeforeNavigation(NavigationHandle* navigation_handle); 68 static void OnBeforeNavigation(NavigationHandle* navigation_handle);
69 static std::unique_ptr<NavigationThrottle> CreateThrottleForNavigation( 69 static std::unique_ptr<NavigationThrottle> CreateThrottleForNavigation(
70 NavigationHandle* navigation_handle); 70 NavigationHandle* navigation_handle);
71 static bool IsNetworkHandlerEnabled(FrameTreeNode* frame_tree_node); 71 static bool IsNetworkHandlerEnabled(FrameTreeNode* frame_tree_node);
72 72
73 static void WebContentsCreated(WebContents* web_contents); 73 static void WebContentsCreated(WebContents* web_contents);
74 74
75 void SynchronousSwapCompositorFrame( 75 static void SignalSynchronousSwapCompositorFrame(
76 RenderFrameHost* frame_host,
76 cc::CompositorFrameMetadata frame_metadata); 77 cc::CompositorFrameMetadata frame_metadata);
77 78
78 bool HasRenderFrameHost(RenderFrameHost* host); 79 bool HasRenderFrameHost(RenderFrameHost* host);
79 80
80 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } 81 FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
81 82
82 // DevTooolsAgentHost overrides. 83 // DevTooolsAgentHost overrides.
83 void DisconnectWebContents() override; 84 void DisconnectWebContents() override;
84 void ConnectWebContents(WebContents* web_contents) override; 85 void ConnectWebContents(WebContents* web_contents) override;
85 BrowserContext* GetBrowserContext() override; 86 BrowserContext* GetBrowserContext() override;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 void OnDispatchOnInspectorFrontend( 162 void OnDispatchOnInspectorFrontend(
162 RenderFrameHost* sender, 163 RenderFrameHost* sender,
163 const DevToolsMessageChunk& message); 164 const DevToolsMessageChunk& message);
164 void OnRequestNewWindow(RenderFrameHost* sender, int new_routing_id); 165 void OnRequestNewWindow(RenderFrameHost* sender, int new_routing_id);
165 void DestroyOnRenderFrameGone(); 166 void DestroyOnRenderFrameGone();
166 167
167 bool CheckConsistency(); 168 bool CheckConsistency();
168 169
169 void CreatePowerSaveBlocker(); 170 void CreatePowerSaveBlocker();
170 171
172 void SynchronousSwapCompositorFrame(
173 cc::CompositorFrameMetadata frame_metadata);
174
171 class FrameHostHolder; 175 class FrameHostHolder;
172 176
173 std::unique_ptr<FrameHostHolder> current_; 177 std::unique_ptr<FrameHostHolder> current_;
174 std::unique_ptr<FrameHostHolder> pending_; 178 std::unique_ptr<FrameHostHolder> pending_;
175 179
176 // Stores per-host state between DisconnectWebContents and ConnectWebContents. 180 // Stores per-host state between DisconnectWebContents and ConnectWebContents.
177 std::unique_ptr<FrameHostHolder> disconnected_; 181 std::unique_ptr<FrameHostHolder> disconnected_;
178 182
179 std::unique_ptr<devtools::dom::DOMHandler> dom_handler_; 183 std::unique_ptr<devtools::dom::DOMHandler> dom_handler_;
180 std::unique_ptr<devtools::input::InputHandler> input_handler_; 184 std::unique_ptr<devtools::input::InputHandler> input_handler_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 221
218 // The FrameTreeNode associated with this agent. 222 // The FrameTreeNode associated with this agent.
219 FrameTreeNode* frame_tree_node_; 223 FrameTreeNode* frame_tree_node_;
220 224
221 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost); 225 DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
222 }; 226 };
223 227
224 } // namespace content 228 } // namespace content
225 229
226 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ 230 #endif // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/devtools/render_frame_devtools_agent_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698