| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 OwnPtr<TracedValue> value = TracedValue::create(); | 56 OwnPtr<TracedValue> value = TracedValue::create(); |
| 57 ScriptLoader* scriptLoader = toScriptLoaderIfPossible(element); | 57 ScriptLoader* scriptLoader = toScriptLoaderIfPossible(element); |
| 58 if (scriptLoader && scriptLoader->resource()) | 58 if (scriptLoader && scriptLoader->resource()) |
| 59 value->setString("url", scriptLoader->resource()->url().getString()); | 59 value->setString("url", scriptLoader->resource()->url().getString()); |
| 60 if (element->ownerDocument() && element->ownerDocument()->frame()) | 60 if (element->ownerDocument() && element->ownerDocument()->frame()) |
| 61 value->setString("frame", String::format("0x%" PRIx64, static_cast<uint6
4_t>(reinterpret_cast<intptr_t>(element->ownerDocument()->frame())))); | 61 value->setString("frame", String::format("0x%" PRIx64, static_cast<uint6
4_t>(reinterpret_cast<intptr_t>(element->ownerDocument()->frame())))); |
| 62 if (textPosition.m_line.zeroBasedInt() > 0 || textPosition.m_column.zeroBase
dInt() > 0) { | 62 if (textPosition.m_line.zeroBasedInt() > 0 || textPosition.m_column.zeroBase
dInt() > 0) { |
| 63 value->setInteger("lineNumber", textPosition.m_line.oneBasedInt()); | 63 value->setInteger("lineNumber", textPosition.m_line.oneBasedInt()); |
| 64 value->setInteger("columnNumber", textPosition.m_column.oneBasedInt()); | 64 value->setInteger("columnNumber", textPosition.m_column.oneBasedInt()); |
| 65 } | 65 } |
| 66 return value.release(); | 66 return value; |
| 67 } | 67 } |
| 68 | 68 |
| 69 bool doExecuteScript(Element* scriptElement, const ScriptSourceCode& sourceCode,
const TextPosition& textPosition) | 69 bool doExecuteScript(Element* scriptElement, const ScriptSourceCode& sourceCode,
const TextPosition& textPosition) |
| 70 { | 70 { |
| 71 ScriptLoader* scriptLoader = toScriptLoaderIfPossible(scriptElement); | 71 ScriptLoader* scriptLoader = toScriptLoaderIfPossible(scriptElement); |
| 72 ASSERT(scriptLoader); | 72 ASSERT(scriptLoader); |
| 73 TRACE_EVENT_WITH_FLOW1("blink", "HTMLScriptRunner ExecuteScript", scriptElem
ent, TRACE_EVENT_FLAG_FLOW_IN, | 73 TRACE_EVENT_WITH_FLOW1("blink", "HTMLScriptRunner ExecuteScript", scriptElem
ent, TRACE_EVENT_FLAG_FLOW_IN, |
| 74 "data", getTraceArgsForScriptElement(scriptElement, textPosition)); | 74 "data", getTraceArgsForScriptElement(scriptElement, textPosition)); |
| 75 return scriptLoader->executeScript(sourceCode); | 75 return scriptLoader->executeScript(sourceCode); |
| 76 } | 76 } |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 | 444 |
| 445 DEFINE_TRACE(HTMLScriptRunner) | 445 DEFINE_TRACE(HTMLScriptRunner) |
| 446 { | 446 { |
| 447 visitor->trace(m_document); | 447 visitor->trace(m_document); |
| 448 visitor->trace(m_host); | 448 visitor->trace(m_host); |
| 449 visitor->trace(m_parserBlockingScript); | 449 visitor->trace(m_parserBlockingScript); |
| 450 visitor->trace(m_scriptsToExecuteAfterParsing); | 450 visitor->trace(m_scriptsToExecuteAfterParsing); |
| 451 } | 451 } |
| 452 | 452 |
| 453 } // namespace blink | 453 } // namespace blink |
| OLD | NEW |