Source/core/inspector/PageDebuggerAgent.h - Issue 1180713005: DevTools: speculative fix of crash in PageDebuggerAgent::restore

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

Issue 1180713005: DevTools: speculative fix of crash in PageDebuggerAgent::restore (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/inspector/InspectorDebuggerAgent.h ('k') | Source/core/inspector/PageDebuggerAgent.cpp » ('j') | no next file with comments »

OLD	NEW
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 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 , public InspectorOverlay::Listener {	51 , public InspectorOverlay::Listener {

52 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);	52 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);

53 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PageDebuggerAgent);	53 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PageDebuggerAgent);

54 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PageDebuggerAgent);	54 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PageDebuggerAgent);

55 public:	55 public:

56 static PassOwnPtrWillBeRawPtr<PageDebuggerAgent> create(MainThreadDebugger, InspectorPageAgent, InjectedScriptManager, InspectorOverlay, int debuggerId) ;	56 static PassOwnPtrWillBeRawPtr<PageDebuggerAgent> create(MainThreadDebugger, InspectorPageAgent, InjectedScriptManager, InspectorOverlay, int debuggerId) ;

57 ~PageDebuggerAgent() override;	57 ~PageDebuggerAgent() override;

58 DECLARE_VIRTUAL_TRACE();	58 DECLARE_VIRTUAL_TRACE();

59	59

60 void enable(ErrorString*) final;	60 void enable(ErrorString*) final;

	61 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;	62 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;	63 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	64

64 void didStartProvisionalLoad(LocalFrame*);	65 void didStartProvisionalLoad(LocalFrame*);

65 void didClearDocumentOfWindowObject(LocalFrame*);	66 void didClearDocumentOfWindowObject(LocalFrame*);

66 void didCommitLoadForLocalFrame(LocalFrame*) override;	67 void didCommitLoadForLocalFrame(LocalFrame*) override;

67	68

68 protected:	69 protected:

69 void enable() override;	70 void enable() override;

70 void disable() override;	71 void disable() override;

(...skipping 17 matching lines...) Expand all Loading...
88 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;	89 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;

89 RawPtrWillBeMember<InspectorOverlay> m_overlay;	90 RawPtrWillBeMember<InspectorOverlay> m_overlay;

90 int m_debuggerId;	91 int m_debuggerId;

91 HashMap<String, String> m_compiledScriptURLs;	92 HashMap<String, String> m_compiledScriptURLs;

92 };	93 };

93	94

94 } // namespace blink	95 } // namespace blink

95	96

96	97

97 #endif // !defined(PageDebuggerAgent_h)	98 #endif // !defined(PageDebuggerAgent_h)

OLD	NEW