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

Unified Diff: content/renderer/devtools/devtools_agent.h

Issue 744653002: Ignore DevTools messages from the old inspected RVH after navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comment Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/devtools_frontend_host.h ('k') | content/renderer/devtools/devtools_agent.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/devtools_agent.h
diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h
index dcb70c5f69272acf19235bb37cf1b7a55a2ce864..8a8d998db7fb59fd090efaf293176bea8382c232 100644
--- a/content/renderer/devtools/devtools_agent.h
+++ b/content/renderer/devtools/devtools_agent.h
@@ -13,7 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "content/public/common/console_message_level.h"
-#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_frame_observer.h"
#include "third_party/WebKit/public/web/WebDevToolsAgentClient.h"
namespace blink {
@@ -23,17 +23,18 @@ class WebDevToolsAgent;
struct GpuTaskInfo;
namespace content {
+
class RenderViewImpl;
// DevToolsAgent belongs to the inspectable RenderView and provides Glue's
// agents with the communication capabilities. All messages from/to Glue's
// agents infrastructure are flowing through this communication agent.
// There is a corresponding DevToolsClient object on the client side.
-class DevToolsAgent : public RenderViewObserver,
+class DevToolsAgent : public RenderFrameObserver,
public base::SupportsWeakPtr<DevToolsAgent>,
public blink::WebDevToolsAgentClient {
public:
- explicit DevToolsAgent(RenderViewImpl* render_view);
+ explicit DevToolsAgent(RenderFrame* main_render_frame);
~DevToolsAgent() override;
// Returns agent instance for its routing id.
@@ -87,6 +88,8 @@ class DevToolsAgent : public RenderViewObserver,
void ContinueProgram();
void OnSetupDevToolsClient();
+ RenderViewImpl* GetRenderViewImpl();
+
static void TraceEventCallbackWrapper(
base::TimeTicks timestamp,
char phase,
@@ -103,6 +106,7 @@ class DevToolsAgent : public RenderViewObserver,
bool is_devtools_client_;
int32 gpu_route_id_;
bool paused_in_mouse_move_;
+ RenderFrame* main_render_frame_;
static base::subtle::AtomicWord /* TraceEventCallback */ event_callback_;
« no previous file with comments | « content/public/browser/devtools_frontend_host.h ('k') | content/renderer/devtools/devtools_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698