Index: third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
diff --git a/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp b/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
index 2c96ff2de9e2a66dfb19fd0e2eb3abe6fcea2c4e..92a5eeb6eda4fc572e753891e38039a2fed2f51d 100644 |
--- a/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
+++ b/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
@@ -72,17 +72,11 @@ Blob* PushMessageData::blob() const { |
ScriptValue PushMessageData::json(ScriptState* scriptState, |
ExceptionState& exceptionState) const { |
- v8::Isolate* isolate = scriptState->isolate(); |
- |
ScriptState::Scope scope(scriptState); |
- v8::Local<v8::String> dataString = v8String(isolate, text()); |
- |
- v8::TryCatch block(isolate); |
- v8::Local<v8::Value> parsed; |
- if (!v8Call(v8::JSON::Parse(isolate, dataString), parsed, block)) { |
- exceptionState.rethrowV8Exception(block.Exception()); |
+ v8::Local<v8::Value> parsed = |
+ fromJSONString(scriptState->isolate(), text(), exceptionState); |
+ if (exceptionState.hadException()) |
return ScriptValue(); |
- } |
return ScriptValue(scriptState, parsed); |
} |