4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtScript module of the Qt Toolkit. |
7 ** This file is part of the QtScript module of the Qt Toolkit. |
8 ** |
8 ** |
9 ** $QT_BEGIN_LICENSE:LGPL$ |
9 ** $QT_BEGIN_LICENSE:LGPL-ONLY$ |
10 ** No Commercial Usage |
|
11 ** This file contains pre-release code and may not be distributed. |
|
12 ** You may use this file in accordance with the terms and conditions |
|
13 ** contained in the Technology Preview License Agreement accompanying |
|
14 ** this package. |
|
15 ** |
|
16 ** GNU Lesser General Public License Usage |
10 ** GNU Lesser General Public License Usage |
17 ** Alternatively, this file may be used under the terms of the GNU Lesser |
11 ** This file may be used under the terms of the GNU Lesser |
18 ** General Public License version 2.1 as published by the Free Software |
12 ** General Public License version 2.1 as published by the Free Software |
19 ** Foundation and appearing in the file LICENSE.LGPL included in the |
13 ** Foundation and appearing in the file LICENSE.LGPL included in the |
20 ** packaging of this file. Please review the following information to |
14 ** packaging of this file. Please review the following information to |
21 ** ensure the GNU Lesser General Public License version 2.1 requirements |
15 ** ensure the GNU Lesser General Public License version 2.1 requirements |
22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. |
16 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. |
23 ** |
17 ** |
24 ** In addition, as a special exception, Nokia gives you certain additional |
|
25 ** rights. These rights are described in the Nokia Qt LGPL Exception |
|
26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. |
|
27 ** |
|
28 ** If you have questions regarding the use of this file, please contact |
18 ** If you have questions regarding the use of this file, please contact |
29 ** Nokia at qt-info@nokia.com. |
19 ** Nokia at qt-info@nokia.com. |
30 ** |
|
31 ** |
|
32 ** |
|
33 ** |
|
34 ** |
|
35 ** |
|
36 ** |
|
37 ** |
|
38 ** $QT_END_LICENSE$ |
20 ** $QT_END_LICENSE$ |
39 ** |
21 ** |
40 ****************************************************************************/ |
22 ****************************************************************************/ |
41 |
23 |
42 #include "config.h" |
24 #include "config.h" |
170 } |
152 } |
171 |
153 |
172 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column) |
154 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column) |
173 { |
155 { |
174 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
156 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
175 Q_ASSERT(source != 0); |
157 if (!source) { |
|
158 // QTBUG-6108: We don't have the source for this script, so ignore. |
|
159 return; |
|
160 } |
176 column = source->columnNumberFromOffset(column); |
161 column = source->columnNumberFromOffset(column); |
177 JSC::CallFrame *oldFrame = engine->currentFrame; |
162 JSC::CallFrame *oldFrame = engine->currentFrame; |
178 int oldAgentLineNumber = engine->agentLineNumber; |
163 int oldAgentLineNumber = engine->agentLineNumber; |
179 engine->currentFrame = frame.callFrame(); |
164 engine->currentFrame = frame.callFrame(); |
180 engine->agentLineNumber = lineno; |
165 engine->agentLineNumber = lineno; |
199 void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& frame, |
184 void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& frame, |
200 intptr_t sourceID, int lineno, int column) |
185 intptr_t sourceID, int lineno, int column) |
201 { |
186 { |
202 if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) { |
187 if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) { |
203 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
188 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
204 Q_ASSERT(source != 0); |
189 if (!source) { |
|
190 // QTBUG-6108: We don't have the source for this script, so ignore. |
|
191 return; |
|
192 } |
205 column = source->columnNumberFromOffset(column); |
193 column = source->columnNumberFromOffset(column); |
206 JSC::CallFrame *oldFrame = engine->currentFrame; |
194 JSC::CallFrame *oldFrame = engine->currentFrame; |
207 int oldAgentLineNumber = engine->agentLineNumber; |
195 int oldAgentLineNumber = engine->agentLineNumber; |
208 engine->currentFrame = frame.callFrame(); |
196 engine->currentFrame = frame.callFrame(); |
209 engine->agentLineNumber = lineno; |
197 engine->agentLineNumber = lineno; |