Source/WebCore/inspector/InspectorRuntimeAgent.h - Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open.

Side by Side Diff: Source/WebCore/inspector/InspectorRuntimeAgent.h

Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 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

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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 const bool* returnByValue,	78 const bool* returnByValue,

79 RefPtr<TypeBuilder::Runtime::RemoteObject>& result,	79 RefPtr<TypeBuilder::Runtime::RemoteObject>& result,

80 TypeBuilder::OptOutput<bool>* wasThrown);	80 TypeBuilder::OptOutput<bool>* wasThrown);

81 virtual void releaseObject(ErrorString*, const String& objectId);	81 virtual void releaseObject(ErrorString*, const String& objectId);

82 virtual void getProperties(ErrorString, const String& objectId, const bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescript or> >& result, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyD escriptor> >& internalProperties);	82 virtual void getProperties(ErrorString, const String& objectId, const bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescript or> >& result, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyD escriptor> >& internalProperties);

83 virtual void releaseObjectGroup(ErrorString*, const String& objectGroup);	83 virtual void releaseObjectGroup(ErrorString*, const String& objectGroup);

84 virtual void run(ErrorString*);	84 virtual void run(ErrorString*);

85	85

86 #if ENABLE(JAVASCRIPT_DEBUGGER)	86 #if ENABLE(JAVASCRIPT_DEBUGGER)

87 void setScriptDebugServer(ScriptDebugServer*);	87 void setScriptDebugServer(ScriptDebugServer*);

88 #if ENABLE(WORKERS)

89 void pauseWorkerContext(WorkerContext*);

90 #endif

91 #endif	88 #endif

92	89

93 protected:	90 protected:

94 InspectorRuntimeAgent(InstrumentingAgents, InspectorState, InjectedScriptM anager*);	91 InspectorRuntimeAgent(InstrumentingAgents, InspectorState, InjectedScriptM anager*);

95 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) = 0;	92 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) = 0;

96	93

97 virtual void muteConsole() = 0;	94 virtual void muteConsole() = 0;

98 virtual void unmuteConsole() = 0;	95 virtual void unmuteConsole() = 0;

99	96

100 InjectedScriptManager* injectedScriptManager() { return m_injectedScriptMana ger; }	97 InjectedScriptManager* injectedScriptManager() { return m_injectedScriptMana ger; }

101 bool m_enabled;	98 bool m_enabled;

102	99

103 private:	100 private:

104 InjectedScriptManager* m_injectedScriptManager;	101 InjectedScriptManager* m_injectedScriptManager;

105 #if ENABLE(JAVASCRIPT_DEBUGGER)	102 #if ENABLE(JAVASCRIPT_DEBUGGER)

106 ScriptDebugServer* m_scriptDebugServer;	103 ScriptDebugServer* m_scriptDebugServer;

107 #endif	104 #endif

108 bool m_paused;

109 };	105 };

110	106

111 } // namespace WebCore	107 } // namespace WebCore

112	108

113 #endif // ENABLE(INSPECTOR)	109 #endif // ENABLE(INSPECTOR)

114 #endif // InspectorRuntimeAgent_h	110 #endif // InspectorRuntimeAgent_h

OLD	NEW

« no previous file with comments | « Source/WebCore/inspector/InspectorPageAgent.cpp ('k') | Source/WebCore/inspector/InspectorRuntimeAgent.cpp » ('j') | no next file with comments »