Source/WebCore/inspector/WorkerInspectorController.h - Issue 12077053: Merge 140127

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12077053: Merge 140127 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « Source/WebCore/inspector/InstrumentingAgents.cpp ('k') | Source/WebCore/inspector/WorkerInspectorController.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 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 #if ENABLE(JAVASCRIPT_DEBUGGER)	68 #if ENABLE(JAVASCRIPT_DEBUGGER)

69 void resume();	69 void resume();

70 #endif	70 #endif

71	71

72 private:	72 private:

73 friend InstrumentingAgents* instrumentationForWorkerContext(WorkerContext*);	73 friend InstrumentingAgents* instrumentationForWorkerContext(WorkerContext*);

74	74

75 WorkerContext* m_workerContext;	75 WorkerContext* m_workerContext;

76 OwnPtr<InspectorStateClient> m_stateClient;	76 OwnPtr<InspectorStateClient> m_stateClient;

77 OwnPtr<InspectorState> m_state;	77 OwnPtr<InspectorState> m_state;

78 OwnPtr<InstrumentingAgents> m_instrumentingAgents;	78 RefPtr<InstrumentingAgents> m_instrumentingAgents;

79 OwnPtr<InjectedScriptManager> m_injectedScriptManager;	79 OwnPtr<InjectedScriptManager> m_injectedScriptManager;

80 InspectorRuntimeAgent* m_runtimeAgent;	80 InspectorRuntimeAgent* m_runtimeAgent;

81 InspectorAgentRegistry m_agents;	81 InspectorAgentRegistry m_agents;

82 OwnPtr<InspectorFrontendChannel> m_frontendChannel;	82 OwnPtr<InspectorFrontendChannel> m_frontendChannel;

83 OwnPtr<InspectorFrontend> m_frontend;	83 OwnPtr<InspectorFrontend> m_frontend;

84 RefPtr<InspectorBackendDispatcher> m_backendDispatcher;	84 RefPtr<InspectorBackendDispatcher> m_backendDispatcher;

85 };	85 };

86	86

87 }	87 }

88	88

89 #endif // ENABLE(WORKERS)	89 #endif // ENABLE(WORKERS)

90	90

91 #endif // !defined(WorkerInspectorController_h)	91 #endif // !defined(WorkerInspectorController_h)

OLD	NEW