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

Side by Side Diff: Source/core/inspector/PageDebuggerAgent.h

Issue 1225763002: Remove debugger id, use local frame id instead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class InspectorPageAgent; 45 class InspectorPageAgent;
46 class MainThreadDebugger; 46 class MainThreadDebugger;
47 47
48 class CORE_EXPORT PageDebuggerAgent final 48 class CORE_EXPORT PageDebuggerAgent final
49 : public InspectorDebuggerAgent 49 : public InspectorDebuggerAgent
50 , public InspectorOverlay::Listener { 50 , public InspectorOverlay::Listener {
51 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 51 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
52 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PageDebuggerAgent); 52 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PageDebuggerAgent);
53 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PageDebuggerAgent); 53 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PageDebuggerAgent);
54 public: 54 public:
55 static PassOwnPtrWillBeRawPtr<PageDebuggerAgent> create(MainThreadDebugger*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*, int debuggerId) ; 55 static PassOwnPtrWillBeRawPtr<PageDebuggerAgent> create(MainThreadDebugger*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*);
56 ~PageDebuggerAgent() override; 56 ~PageDebuggerAgent() override;
57 DECLARE_VIRTUAL_TRACE(); 57 DECLARE_VIRTUAL_TRACE();
58 58
59 void enable(ErrorString*) final; 59 void enable(ErrorString*) final;
60 void restore() final; 60 void restore() final;
61 void compileScript(ErrorString*, const String& expression, const String& sou rceURL, bool persistScript, const int* executionContextId, TypeBuilder::OptOutpu t<TypeBuilder::Debugger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDeta ils>&) override; 61 void compileScript(ErrorString*, const String& expression, const String& sou rceURL, bool persistScript, const int* executionContextId, TypeBuilder::OptOutpu t<TypeBuilder::Debugger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDeta ils>&) override;
62 void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const i nt* executionContextId, const String* objectGroup, const bool* doNotPauseOnExcep tionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr< TypeBuilder::Debugger::ExceptionDetails>&) override; 62 void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const i nt* executionContextId, const String* objectGroup, const bool* doNotPauseOnExcep tionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr< TypeBuilder::Debugger::ExceptionDetails>&) override;
63 63
64 void didStartProvisionalLoad(LocalFrame*); 64 void didStartProvisionalLoad(LocalFrame*);
65 void didClearDocumentOfWindowObject(LocalFrame*); 65 void didClearDocumentOfWindowObject(LocalFrame*);
(...skipping 10 matching lines...) Expand all
76 void muteConsole() override; 76 void muteConsole() override;
77 void unmuteConsole() override; 77 void unmuteConsole() override;
78 78
79 // InspectorOverlay::Listener implementation. 79 // InspectorOverlay::Listener implementation.
80 void overlayResumed() override; 80 void overlayResumed() override;
81 void overlaySteppedOver() override; 81 void overlaySteppedOver() override;
82 82
83 InjectedScript injectedScriptForEval(ErrorString*, const int* executionConte xtId) override; 83 InjectedScript injectedScriptForEval(ErrorString*, const int* executionConte xtId) override;
84 bool canExecuteScripts() const; 84 bool canExecuteScripts() const;
85 85
86 PageDebuggerAgent(MainThreadDebugger*, InspectorPageAgent*, InjectedScriptMa nager*, InspectorOverlay*, int debuggerId); 86 PageDebuggerAgent(MainThreadDebugger*, InspectorPageAgent*, InjectedScriptMa nager*, InspectorOverlay*);
87 RawPtrWillBeMember<MainThreadDebugger> m_mainThreadDebugger; 87 RawPtrWillBeMember<MainThreadDebugger> m_mainThreadDebugger;
88 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent; 88 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
89 RawPtrWillBeMember<InspectorOverlay> m_overlay; 89 RawPtrWillBeMember<InspectorOverlay> m_overlay;
90 int m_debuggerId;
91 HashMap<String, String> m_compiledScriptURLs; 90 HashMap<String, String> m_compiledScriptURLs;
92 }; 91 };
93 92
94 } // namespace blink 93 } // namespace blink
95 94
96 95
97 #endif // !defined(PageDebuggerAgent_h) 96 #endif // !defined(PageDebuggerAgent_h)
OLDNEW
« no previous file with comments | « Source/core/inspector/MainThreadDebugger.cpp ('k') | Source/core/inspector/PageDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698