Correctly attribute exceptions thrown inside a Worker's imported scripts.

Source/bindings/v8/WorkerScriptController.h

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WorkerScriptController_h
 #define WorkerScriptController_h
 
 #include "bindings/v8/ScriptValue.h"
 #include "bindings/v8/V8Binding.h"
-#include <v8.h>
+#include "core/dom/ErrorEvent.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/text/TextPosition.h"
+#include <v8.h>
 
 namespace WebCore {
 
     class ScriptSourceCode;
     class ScriptValue;
     class WorkerGlobalScope;
 
     struct WorkerGlobalScopeExecutionState {
         WorkerGlobalScopeExecutionState()
             : hadException(false)
             , lineNumber(0)
             , columnNumber(0)
         {
         }
 
         bool hadException;
-        ScriptValue exception;
         String errorMessage;
         int lineNumber;
         int columnNumber;
         String sourceURL;
     };
 
     class WorkerScriptController {
     public:
         WorkerScriptController(WorkerGlobalScope*);
         ~WorkerScriptController();
 
         WorkerGlobalScope* workerGlobalScope() { return m_workerGlobalScope; }
 
-        void evaluate(const ScriptSourceCode&, ScriptValue* = 0);
+        void evaluate(const ScriptSourceCode&, RefPtr<ErrorEvent>* = 0);
 
-        void setException(const ScriptValue&);
+        void rethrowExceptionFromImportedScript(PassRefPtr<ErrorEvent>);
 
         // Async request to terminate a future JS execution. Eventually causes termination
         // exception raised during JS execution, if the worker thread happens to run JS.
         // After JS execution was terminated in this way, the Worker thread has to use
         // forbidExecution()/isExecutionForbidden() to guard against reentry into JS.
         // Can be called from any thread.
         void scheduleExecutionTermination();
         bool isExecutionTerminating() const;
 
         // Called on Worker thread when JS exits with termination exception caused by forbidExecution() request,
@@ skipping 23 matching lines @@
 
         WorkerGlobalScope* m_workerGlobalScope;
         v8::Isolate* m_isolate;
         ScopedPersistent<v8::Context> m_context;
         OwnPtr<V8PerContextData> m_perContextData;
         String m_disableEvalPending;
         OwnPtr<DOMDataStore> m_domDataStore;
         bool m_executionForbidden;
         bool m_executionScheduledToTerminate;
         mutable Mutex m_scheduledTerminationMutex;
+        RefPtr<ErrorEvent> m_errorEventFromImportedScript;
     };
 
 } // namespace WebCore
 
 #endif // WorkerScriptController_h