| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WorkerScriptController_h | 31 #ifndef WorkerScriptController_h |
| 32 #define WorkerScriptController_h | 32 #define WorkerScriptController_h |
| 33 | 33 |
| 34 #include "bindings/v8/ScriptValue.h" | 34 #include "bindings/v8/ScriptValue.h" |
| 35 #include "bindings/v8/V8Binding.h" | 35 #include "bindings/v8/V8Binding.h" |
| 36 #include "core/events/ErrorEvent.h" | 36 #include "core/dom/ErrorEvent.h" |
| 37 #include "wtf/OwnPtr.h" | 37 #include "wtf/OwnPtr.h" |
| 38 #include "wtf/ThreadingPrimitives.h" | 38 #include "wtf/ThreadingPrimitives.h" |
| 39 #include "wtf/text/TextPosition.h" | 39 #include "wtf/text/TextPosition.h" |
| 40 #include <v8.h> | 40 #include <v8.h> |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 class ScriptSourceCode; | 44 class ScriptSourceCode; |
| 45 class ScriptValue; | 45 class ScriptValue; |
| 46 class WorkerGlobalScope; | 46 class WorkerGlobalScope; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 OwnPtr<DOMDataStore> m_domDataStore; | 115 OwnPtr<DOMDataStore> m_domDataStore; |
| 116 bool m_executionForbidden; | 116 bool m_executionForbidden; |
| 117 bool m_executionScheduledToTerminate; | 117 bool m_executionScheduledToTerminate; |
| 118 mutable Mutex m_scheduledTerminationMutex; | 118 mutable Mutex m_scheduledTerminationMutex; |
| 119 RefPtr<ErrorEvent> m_errorEventFromImportedScript; | 119 RefPtr<ErrorEvent> m_errorEventFromImportedScript; |
| 120 }; | 120 }; |
| 121 | 121 |
| 122 } // namespace WebCore | 122 } // namespace WebCore |
| 123 | 123 |
| 124 #endif // WorkerScriptController_h | 124 #endif // WorkerScriptController_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 26558004:
Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed)
Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/