OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 4 * Copyright (C) 2014 Opera Software ASA. 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 are | 7 * modification, are permitted provided that the following conditions are |
8 * met: | 8 * met: |
9 * | 9 * |
10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 v8::TryCatch tryCatch; | 193 v8::TryCatch tryCatch; |
194 tryCatch.SetVerbose(true); | 194 tryCatch.SetVerbose(true); |
195 | 195 |
196 v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(source, m_
isolate, corsStatus, v8CacheOptions); | 196 v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(source, m_
isolate, corsStatus, v8CacheOptions); |
197 | 197 |
198 if (compilationFinishTime) { | 198 if (compilationFinishTime) { |
199 *compilationFinishTime = WTF::monotonicallyIncreasingTime(); | 199 *compilationFinishTime = WTF::monotonicallyIncreasingTime(); |
200 } | 200 } |
201 // Keep LocalFrame (and therefore ScriptController) alive. | 201 // Keep LocalFrame (and therefore ScriptController) alive. |
202 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); | 202 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); |
203 result = V8ScriptRunner::runCompiledScript(script, m_frame->document(),
m_isolate); | 203 result = V8ScriptRunner::runCompiledScript(m_isolate, script, m_frame->d
ocument()); |
204 ASSERT(!tryCatch.HasCaught() || result.IsEmpty()); | 204 ASSERT(!tryCatch.HasCaught() || result.IsEmpty()); |
205 } | 205 } |
206 | 206 |
207 InspectorInstrumentation::didEvaluateScript(cookie); | 207 InspectorInstrumentation::didEvaluateScript(cookie); |
208 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", "data", InspectorUpdateCountersEvent::data()); | 208 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", "data", InspectorUpdateCountersEvent::data()); |
209 | 209 |
210 return result; | 210 return result; |
211 } | 211 } |
212 | 212 |
213 bool ScriptController::initializeMainWorld() | 213 bool ScriptController::initializeMainWorld() |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
644 resultArray->Set(i, evaluationResult); | 644 resultArray->Set(i, evaluationResult); |
645 } | 645 } |
646 | 646 |
647 if (results) { | 647 if (results) { |
648 for (size_t i = 0; i < resultArray->Length(); ++i) | 648 for (size_t i = 0; i < resultArray->Length(); ++i) |
649 results->append(handleScope.Escape(resultArray->Get(i))); | 649 results->append(handleScope.Escape(resultArray->Get(i))); |
650 } | 650 } |
651 } | 651 } |
652 | 652 |
653 } // namespace blink | 653 } // namespace blink |
OLD | NEW |