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 30 matching lines...) Expand all Loading... |
41 namespace WebCore { | 41 namespace WebCore { |
42 | 42 |
43 class ScriptSourceCode; | 43 class ScriptSourceCode; |
44 class ScriptValue; | 44 class ScriptValue; |
45 class WorkerGlobalScope; | 45 class WorkerGlobalScope; |
46 | 46 |
47 struct WorkerGlobalScopeExecutionState { | 47 struct WorkerGlobalScopeExecutionState { |
48 WorkerGlobalScopeExecutionState() | 48 WorkerGlobalScopeExecutionState() |
49 : hadException(false) | 49 : hadException(false) |
50 , lineNumber(0) | 50 , lineNumber(0) |
| 51 , columnNumber(0) |
51 { | 52 { |
52 } | 53 } |
53 | 54 |
54 bool hadException; | 55 bool hadException; |
55 ScriptValue exception; | 56 ScriptValue exception; |
56 String errorMessage; | 57 String errorMessage; |
57 int lineNumber; | 58 int lineNumber; |
| 59 int columnNumber; |
58 String sourceURL; | 60 String sourceURL; |
59 }; | 61 }; |
60 | 62 |
61 class WorkerScriptController { | 63 class WorkerScriptController { |
62 public: | 64 public: |
63 WorkerScriptController(WorkerGlobalScope*); | 65 WorkerScriptController(WorkerGlobalScope*); |
64 ~WorkerScriptController(); | 66 ~WorkerScriptController(); |
65 | 67 |
66 WorkerGlobalScope* workerGlobalScope() { return m_workerGlobalScope; } | 68 WorkerGlobalScope* workerGlobalScope() { return m_workerGlobalScope; } |
67 | 69 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 String m_disableEvalPending; | 111 String m_disableEvalPending; |
110 OwnPtr<DOMDataStore> m_domDataStore; | 112 OwnPtr<DOMDataStore> m_domDataStore; |
111 bool m_executionForbidden; | 113 bool m_executionForbidden; |
112 bool m_executionScheduledToTerminate; | 114 bool m_executionScheduledToTerminate; |
113 mutable Mutex m_scheduledTerminationMutex; | 115 mutable Mutex m_scheduledTerminationMutex; |
114 }; | 116 }; |
115 | 117 |
116 } // namespace WebCore | 118 } // namespace WebCore |
117 | 119 |
118 #endif // WorkerScriptController_h | 120 #endif // WorkerScriptController_h |
OLD | NEW |