bindings: Use CreateDataProperty() instead of ForceSet()

Source/bindings/core/v8/ScriptValueSerializer.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "bindings/core/v8/ScriptValueSerializer.h"
 
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8ArrayBufferView.h"
 #include "bindings/core/v8/V8Blob.h"
@@ skipping 1807 matching lines @@
         if (!closeComposite(&composite))
             return false;
         array = composite.As<v8::Array>();
     }
     if (array.IsEmpty())
         return false;
     if (!initializeObject(array, numProperties, value))
         return false;
     if (length > stackDepth())
         return false;
-    v8::Isolate* isolate = m_reader.scriptState()->isolate();
     v8::Local<v8::Context> context = m_reader.scriptState()->context();
     for (unsigned i = 0, stackPos = stackDepth() - length; i < length; i++, stackPos++) {
         v8::Local<v8::Value> elem = element(stackPos);
         if (!elem->IsUndefined()) {
-            // TODO(jsbell): Use DefineOwnProperty when exposed by v8. http://crbug.com/475206
-            if (!v8CallBoolean(array->ForceSet(context, v8::Integer::New(isolate, i), elem)))
+            if (!v8CallBoolean(array->CreateDataProperty(context, i, elem)))
                 return false;
         }
     }
     pop(length);
     return true;
 }
 
 void ScriptValueDeserializer::pushObjectReference(const v8::Local<v8::Value>& object)
 {
     m_objectPool.append(object);
@@ skipping 45 matching lines @@
 
 bool ScriptValueDeserializer::initializeObject(v8::Local<v8::Object> object, uint32_t numProperties, v8::Local<v8::Value>* value)
 {
     unsigned length = 2 * numProperties;
     if (length > stackDepth())
         return false;
     v8::Local<v8::Context> context = m_reader.scriptState()->context();
     for (unsigned i = stackDepth() - length; i < stackDepth(); i += 2) {
         v8::Local<v8::Value> propertyName = element(i);
         v8::Local<v8::Value> propertyValue = element(i + 1);
-        // TODO(jsbell): Use DefineOwnProperty when exposed by v8. http://crbug.com/475206
-        if (!v8CallBoolean(object->ForceSet(context, propertyName, propertyValue)))
+        bool result = false;
+        if (propertyName->IsString())
+            result = v8CallBoolean(object->CreateDataProperty(context, propertyName.As<v8::String>(), propertyValue));
+        else if (propertyName->IsUint32())
+            result = v8CallBoolean(object->CreateDataProperty(context, propertyName.As<v8::Uint32>()->Value(), propertyValue));
+        else
+            ASSERT_NOT_REACHED();
+        if (!result)
             return false;
     }
     pop(length);
     *value = object;
     return true;
 }
 
 bool ScriptValueDeserializer::read(v8::Local<v8::Value>* value)
 {
     return m_reader.read(value, *this);
@@ skipping 28 matching lines @@
         return false;
     uint32_t objectReference = m_openCompositeReferenceStack[m_openCompositeReferenceStack.size() - 1];
     m_openCompositeReferenceStack.shrink(m_openCompositeReferenceStack.size() - 1);
     if (objectReference >= m_objectPool.size())
         return false;
     *object = m_objectPool[objectReference];
     return true;
 }
 
 } // namespace blink