Chromium Code Reviews| 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) 2009, 2011 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009, 2011 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 scriptLoader->loadSynchronously(executionContext(), *it, AllowCrossOrigi nRequests); | 229 scriptLoader->loadSynchronously(executionContext(), *it, AllowCrossOrigi nRequests); |
| 230 | 230 |
| 231 // If the fetching attempt failed, throw a NetworkError exception and ab ort all these steps. | 231 // If the fetching attempt failed, throw a NetworkError exception and ab ort all these steps. |
| 232 if (scriptLoader->failed()) { | 232 if (scriptLoader->failed()) { |
| 233 exceptionState.throwDOMException(NetworkError, "The script at '" + i t->elidedString() + "' failed to load."); | 233 exceptionState.throwDOMException(NetworkError, "The script at '" + i t->elidedString() + "' failed to load."); |
| 234 return; | 234 return; |
| 235 } | 235 } |
| 236 | 236 |
| 237 InspectorInstrumentation::scriptImported(executionContext(), scriptLoade r->identifier(), scriptLoader->script()); | 237 InspectorInstrumentation::scriptImported(executionContext(), scriptLoade r->identifier(), scriptLoader->script()); |
| 238 | 238 |
| 239 RefPtr<ErrorEvent> errorEvent; | 239 RefPtrWillBeRawPtr<ErrorEvent> errorEvent = nullptr; |
|
haraken
2014/04/03 10:39:31
This '= nullptr' was necessary.
| |
| 240 m_script->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader ->responseURL()), &errorEvent); | 240 m_script->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader ->responseURL()), &errorEvent); |
| 241 if (errorEvent) { | 241 if (errorEvent) { |
| 242 m_script->rethrowExceptionFromImportedScript(errorEvent.release()); | 242 m_script->rethrowExceptionFromImportedScript(errorEvent.release()); |
| 243 return; | 243 return; |
| 244 } | 244 } |
| 245 } | 245 } |
| 246 } | 246 } |
| 247 | 247 |
| 248 EventTarget* WorkerGlobalScope::errorEventTarget() | 248 EventTarget* WorkerGlobalScope::errorEventTarget() |
| 249 { | 249 { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 303 { | 303 { |
| 304 visitor->trace(m_console); | 304 visitor->trace(m_console); |
| 305 visitor->trace(m_location); | 305 visitor->trace(m_location); |
| 306 visitor->trace(m_navigator); | 306 visitor->trace(m_navigator); |
| 307 #if ENABLE(OILPAN) | 307 #if ENABLE(OILPAN) |
| 308 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 308 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 309 #endif | 309 #endif |
| 310 } | 310 } |
| 311 | 311 |
| 312 } // namespace WebCore | 312 } // namespace WebCore |
| OLD | NEW |