2009-06-22 Jian Li <jianli@chromium.org>

        Reviewed by Dimitri Glazkov.

        Bug 26626: Make WorkerContextExecutionProxy::toV8Object handle exception
        objects.
        https://bugs.webkit.org/show_bug.cgi?id=26626

        * bindings/v8/WorkerContextExecutionProxy.cpp:
        (WebCore::WorkerContextExecutionProxy::ToV8Object):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@44965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e3abc49..de8a040 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-06-22  Jian Li  <jianli@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Bug 26626: Make WorkerContextExecutionProxy::toV8Object handle exception
+        objects.
+        https://bugs.webkit.org/show_bug.cgi?id=26626
+
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::ToV8Object):
+

 2009-06-22  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Sam Weinig.
 2009-06-22  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
index 2cf043d..a8fbc0a 100644 (file)
--- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -37,7 +37,11 @@
 
 #include "V8Binding.h"
 #include "V8Proxy.h"
 
 #include "V8Binding.h"
 #include "V8Proxy.h"

+#include "DOMCoreException.h"

 #include "Event.h"
 #include "Event.h"

+#include "EventException.h"
+#include "RangeException.h"
+#include "XMLHttpRequestException.h"

 #include "V8WorkerContextEventListener.h"
 #include "V8WorkerContextObjectEventListener.h"
 #include "Worker.h"
 #include "V8WorkerContextEventListener.h"
 #include "V8WorkerContextObjectEventListener.h"
 #include "Worker.h"


@@ -242,6 +246,18 @@ v8::Handle<v8::Value> WorkerContextExecutionProxy::ToV8Object(V8ClassIndex::V8Wr
             case V8ClassIndex::WORKERNAVIGATOR:
                 static_cast<WorkerNavigator*>(impl)->ref();
                 break;
             case V8ClassIndex::WORKERNAVIGATOR:
                 static_cast<WorkerNavigator*>(impl)->ref();
                 break;

+            case V8ClassIndex::DOMCOREEXCEPTION:
+                static_cast<DOMCoreException*>(impl)->ref();
+                break;
+            case V8ClassIndex::RANGEEXCEPTION:
+                static_cast<RangeException*>(impl)->ref();
+                break;
+            case V8ClassIndex::EVENTEXCEPTION:
+                static_cast<EventException*>(impl)->ref();
+                break;
+            case V8ClassIndex::XMLHTTPREQUESTEXCEPTION:
+                static_cast<XMLHttpRequestException*>(impl)->ref();
+                break;

             default:
                 ASSERT(false);
             }
             default:
                 ASSERT(false);
             }