Use ExceptionState to throw exceptions when converting arrays

Source/bindings/core/v8/V8StringResource.h

 /*
  * Copyright (C) 2009 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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 V8StringResource_h
 #define V8StringResource_h
 
+#include "bindings/core/v8/ExceptionState.h"
 #include "wtf/Threading.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/WTFString.h"
 #include <v8.h>
 
 namespace blink {
 
 class ExternalStringVisitor;
 
 // WebCoreStringResource is a helper class for v8ExternalString. It is used
@@ skipping 152 matching lines @@
         setString(string);
     }
 
     void operator=(std::nullptr_t)
     {
         setString(String());
     }
 
     bool prepare()
     {
+        if (prepareSimple())

[haraken, 2014/09/24 09:29:49]

prepareFast ? (We normally add "Fast" for a fast path method.)

[Jens Widell, 2014/09/24 10:00:19]

Done.

+            return true;
+
+        v8::TryCatch block;
+        m_v8Object = m_v8Object->ToString();
+        // Handle the case where an exception is thrown as part of invoking toString on the object.
+        if (block.HasCaught()) {
+            block.ReThrow();
+            return false;
+        }
+        return true;
+    }
+
+    bool prepare(ExceptionState& exceptionState)
+    {
+        if (prepareSimple())
+            return true;
+
+        v8::TryCatch block;
+        m_v8Object = m_v8Object->ToString();
+        // Handle the case where an exception is thrown as part of invoking toString on the object.
+        if (block.HasCaught()) {
+            exceptionState.rethrowV8Exception(block.Exception());
+            return false;
+        }
+        return true;
+    }
+
+    operator String() const { return toString<String>(); }
+    operator AtomicString() const { return toString<AtomicString>(); }
+
+private:
+    bool prepareSimple()
+    {
         if (m_v8Object.IsEmpty())
             return true;
 
         if (!isValid()) {
             setString(fallbackString());
             return true;
         }
 
         if (LIKELY(m_v8Object->IsString()))
             return true;
 
         if (LIKELY(m_v8Object->IsInt32())) {
             setString(int32ToWebCoreString(m_v8Object->Int32Value()));
             return true;
         }
 
         m_mode = DoNotExternalize;
-        v8::TryCatch block;
-        m_v8Object = m_v8Object->ToString();
-        // Handle the case where an exception is thrown as part of invoking toString on the object.
-        if (block.HasCaught()) {
-            block.ReThrow();
-            return false;
-        }
-        return true;
+        return false;
     }
-    operator String() const { return toString<String>(); }
-    operator AtomicString() const { return toString<AtomicString>(); }
 
-private:
     bool isValid() const;
     String fallbackString() const;
 
     void setString(const String& string)
     {
         m_string = string;
         m_v8Object.Clear(); // To signal that String is ready.
     }
 
     template <class StringType>
@@ skipping 47 matching lines @@
 }
 
 template<> inline String V8StringResource<TreatNullAndUndefinedAsNullString>::fallbackString() const
 {
     return String();
 }
 
 } // namespace blink
 
 #endif // V8StringResource_h