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

Side by Side Diff: Source/core/inspector/InjectedScriptHost.cpp

Issue 1030163002: Oilpan: fix build after r192519. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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/core/inspector/InjectedScriptHost.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 13 matching lines...) Expand all
24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/InjectedScriptHost.h" 32 #include "core/inspector/InjectedScriptHost.h"
33 33
34 #include "bindings/core/v8/ScriptDebugServer.h"
34 #include "core/inspector/InspectorConsoleAgent.h" 35 #include "core/inspector/InspectorConsoleAgent.h"
35 #include "core/inspector/InspectorDOMAgent.h" 36 #include "core/inspector/InspectorDOMAgent.h"
36 #include "core/inspector/InspectorDebuggerAgent.h" 37 #include "core/inspector/InspectorDebuggerAgent.h"
37 #include "core/inspector/InspectorInspectorAgent.h" 38 #include "core/inspector/InspectorInspectorAgent.h"
38 #include "platform/JSONValues.h" 39 #include "platform/JSONValues.h"
39 40
40 #include "wtf/RefPtr.h" 41 #include "wtf/RefPtr.h"
41 #include "wtf/text/StringBuilder.h" 42 #include "wtf/text/StringBuilder.h"
42 43
43 namespace blink { 44 namespace blink {
(...skipping 13 matching lines...) Expand all
57 } 58 }
58 59
59 InjectedScriptHost::~InjectedScriptHost() 60 InjectedScriptHost::~InjectedScriptHost()
60 { 61 {
61 } 62 }
62 63
63 DEFINE_TRACE(InjectedScriptHost) 64 DEFINE_TRACE(InjectedScriptHost)
64 { 65 {
65 visitor->trace(m_consoleAgent); 66 visitor->trace(m_consoleAgent);
66 visitor->trace(m_debuggerAgent); 67 visitor->trace(m_debuggerAgent);
67 visitor->trace(m_inspectCallback); 68 visitor->trace(m_scriptDebugServer);
68 } 69 }
69 70
70 void InjectedScriptHost::disconnect() 71 void InjectedScriptHost::disconnect()
71 { 72 {
72 m_consoleAgent = nullptr; 73 m_consoleAgent = nullptr;
73 m_debuggerAgent = nullptr; 74 m_debuggerAgent = nullptr;
74 m_inspectCallback = nullptr; 75 m_inspectCallback = nullptr;
75 m_scriptDebugServer = nullptr; 76 m_scriptDebugServer = nullptr;
76 } 77 }
77 78
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, Inspe ctorDebuggerAgent::MonitorCommandBreakpointSource, builder.toString()); 146 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, Inspe ctorDebuggerAgent::MonitorCommandBreakpointSource, builder.toString());
146 } 147 }
147 148
148 void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumbe r, int columnNumber) 149 void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumbe r, int columnNumber)
149 { 150 {
150 if (m_debuggerAgent) 151 if (m_debuggerAgent)
151 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, In spectorDebuggerAgent::MonitorCommandBreakpointSource); 152 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, In spectorDebuggerAgent::MonitorCommandBreakpointSource);
152 } 153 }
153 154
154 } // namespace blink 155 } // namespace blink
155
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698