diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp b/chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp index 553bdbcfe3c..539811acdd1 100644 --- a/chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp +++ b/chromium/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp @@ -29,8 +29,9 @@ */ #include "config.h" -#include "WebSerializedScriptValue.h" +#include "public/web/WebSerializedScriptValue.h" +#include "bindings/v8/ExceptionState.h" #include "bindings/v8/SerializedScriptValue.h" #include "public/platform/WebString.h" @@ -45,9 +46,9 @@ WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Value> value) { - bool didThrow; - WebSerializedScriptValue serializedValue = SerializedScriptValue::create(value, 0, 0, didThrow, v8::Isolate::GetCurrent()); - if (didThrow) + WebCore::TrackExceptionState exceptionState; + WebSerializedScriptValue serializedValue = SerializedScriptValue::create(value, 0, 0, exceptionState, v8::Isolate::GetCurrent()); + if (exceptionState.hadException()) return createInvalid(); return serializedValue; } |