| Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
|
| index dfe5b923be1ba988dbf40af7f9e5776bba1bc03f..1eed26ced68a4f5edad2ea9277581a58db0a9463 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
|
| @@ -42,6 +42,7 @@
|
| #include "platform/v8_inspector/V8InspectorSessionImpl.h"
|
| #include "platform/v8_inspector/V8StackTraceImpl.h"
|
| #include "platform/v8_inspector/V8StringUtil.h"
|
| +#include "platform/v8_inspector/V8ValueCopier.h"
|
| #include "platform/v8_inspector/public/V8InspectorClient.h"
|
|
|
| using blink::protocol::Array;
|
| @@ -159,7 +160,7 @@ std::unique_ptr<protocol::Runtime::RemoteObject> InjectedScript::wrapObject(Erro
|
| return remoteObject;
|
| }
|
|
|
| -bool InjectedScript::wrapObjectProperty(ErrorString* errorString, v8::Local<v8::Object> object, v8::Local<v8::Value> key, const String16& groupName, bool forceValueType, bool generatePreview) const
|
| +bool InjectedScript::wrapObjectProperty(ErrorString* errorString, v8::Local<v8::Object> object, v8::Local<v8::Name> key, const String16& groupName, bool forceValueType, bool generatePreview) const
|
| {
|
| v8::Local<v8::Value> property;
|
| if (hasInternalError(errorString, !object->Get(m_context->context(), key).ToLocal(&property)))
|
| @@ -167,7 +168,7 @@ bool InjectedScript::wrapObjectProperty(ErrorString* errorString, v8::Local<v8::
|
| v8::Local<v8::Value> wrappedProperty;
|
| if (!wrapValue(errorString, property, groupName, forceValueType, generatePreview).ToLocal(&wrappedProperty))
|
| return false;
|
| - v8::Maybe<bool> success = object->Set(m_context->context(), key, wrappedProperty);
|
| + v8::Maybe<bool> success = safeCreateDataProperty(m_context->context(), object, key, wrappedProperty);
|
| if (hasInternalError(errorString, success.IsNothing() || !success.FromJust()))
|
| return false;
|
| return true;
|
|
|