| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2012 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2012 Google Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 if (!dispatchErrorEvent(errorEvent, corsStatus)) | 159 if (!dispatchErrorEvent(errorEvent, corsStatus)) |
| 160 logExceptionToConsole(errorEvent->messageForConsole(), scriptId, errorEv
ent->filename(), errorEvent->lineno(), errorEvent->colno(), callStack); | 160 logExceptionToConsole(errorEvent->messageForConsole(), scriptId, errorEv
ent->filename(), errorEvent->lineno(), errorEvent->colno(), callStack); |
| 161 | 161 |
| 162 if (!m_pendingExceptions) | 162 if (!m_pendingExceptions) |
| 163 return; | 163 return; |
| 164 | 164 |
| 165 for (size_t i = 0; i < m_pendingExceptions->size(); i++) { | 165 for (size_t i = 0; i < m_pendingExceptions->size(); i++) { |
| 166 PendingException* e = m_pendingExceptions->at(i).get(); | 166 PendingException* e = m_pendingExceptions->at(i).get(); |
| 167 logExceptionToConsole(e->m_errorMessage, e->m_scriptId, e->m_sourceURL,
e->m_lineNumber, e->m_columnNumber, e->m_callStack); | 167 logExceptionToConsole(e->m_errorMessage, e->m_scriptId, e->m_sourceURL,
e->m_lineNumber, e->m_columnNumber, e->m_callStack); |
| 168 } | 168 } |
| 169 m_pendingExceptions.clear(); | 169 m_pendingExceptions.reset(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 bool ExecutionContext::dispatchErrorEvent(ErrorEvent* errorEvent, AccessControlS
tatus corsStatus) | 172 bool ExecutionContext::dispatchErrorEvent(ErrorEvent* errorEvent, AccessControlS
tatus corsStatus) |
| 173 { | 173 { |
| 174 EventTarget* target = errorEventTarget(); | 174 EventTarget* target = errorEventTarget(); |
| 175 if (!target) | 175 if (!target) |
| 176 return false; | 176 return false; |
| 177 | 177 |
| 178 if (shouldSanitizeScriptError(errorEvent->filename(), corsStatus)) | 178 if (shouldSanitizeScriptError(errorEvent->filename(), corsStatus)) |
| 179 errorEvent = ErrorEvent::createSanitizedError(errorEvent->world()); | 179 errorEvent = ErrorEvent::createSanitizedError(errorEvent->world()); |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 274 } |
| 275 | 275 |
| 276 DEFINE_TRACE(ExecutionContext) | 276 DEFINE_TRACE(ExecutionContext) |
| 277 { | 277 { |
| 278 visitor->trace(m_publicURLManager); | 278 visitor->trace(m_publicURLManager); |
| 279 ContextLifecycleNotifier::trace(visitor); | 279 ContextLifecycleNotifier::trace(visitor); |
| 280 Supplementable<ExecutionContext>::trace(visitor); | 280 Supplementable<ExecutionContext>::trace(visitor); |
| 281 } | 281 } |
| 282 | 282 |
| 283 } // namespace blink | 283 } // namespace blink |
| OLD | NEW |