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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 , columnNumber(0) | 51 , columnNumber(0) |
52 { | 52 { |
53 } | 53 } |
54 | 54 |
55 bool hadException; | 55 bool hadException; |
56 ScriptValue exception; | 56 ScriptValue exception; |
57 String errorMessage; | 57 String errorMessage; |
58 int lineNumber; | 58 int lineNumber; |
59 int columnNumber; | 59 int columnNumber; |
60 String sourceURL; | 60 String sourceURL; |
| 61 ScriptValue error; |
61 }; | 62 }; |
62 | 63 |
63 class WorkerScriptController { | 64 class WorkerScriptController { |
64 public: | 65 public: |
65 WorkerScriptController(WorkerGlobalScope*); | 66 WorkerScriptController(WorkerGlobalScope*); |
66 ~WorkerScriptController(); | 67 ~WorkerScriptController(); |
67 | 68 |
68 WorkerGlobalScope* workerGlobalScope() { return m_workerGlobalScope; } | 69 WorkerGlobalScope* workerGlobalScope() { return m_workerGlobalScope; } |
69 | 70 |
70 void evaluate(const ScriptSourceCode&, ScriptValue* = 0); | 71 void evaluate(const ScriptSourceCode&, ScriptValue* = 0); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 String m_disableEvalPending; | 112 String m_disableEvalPending; |
112 OwnPtr<DOMDataStore> m_domDataStore; | 113 OwnPtr<DOMDataStore> m_domDataStore; |
113 bool m_executionForbidden; | 114 bool m_executionForbidden; |
114 bool m_executionScheduledToTerminate; | 115 bool m_executionScheduledToTerminate; |
115 mutable Mutex m_scheduledTerminationMutex; | 116 mutable Mutex m_scheduledTerminationMutex; |
116 }; | 117 }; |
117 | 118 |
118 } // namespace WebCore | 119 } // namespace WebCore |
119 | 120 |
120 #endif // WorkerScriptController_h | 121 #endif // WorkerScriptController_h |
OLD | NEW |