Merge 144458

Source/WebCore/bindings/v8/ScriptValue.cpp

Index: Source/WebCore/bindings/v8/ScriptValue.cpp
===================================================================
--- Source/WebCore/bindings/v8/ScriptValue.cpp	(revision 146152)
+++ Source/WebCore/bindings/v8/ScriptValue.cpp	(working copy)
@@ -47,13 +47,13 @@
 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptState)
 {
     ScriptScope scope(scriptState);
-    return SerializedScriptValue::create(v8Value());
+    return SerializedScriptValue::create(v8ValueRaw());
 }
 
 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptState, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThrow)
 {
     ScriptScope scope(scriptState);
-    return SerializedScriptValue::create(v8Value(), messagePorts, arrayBuffers, didThrow);
+    return SerializedScriptValue::create(v8ValueRaw(), messagePorts, arrayBuffers, didThrow);
 }
 
 ScriptValue ScriptValue::deserialize(ScriptState* scriptState, SerializedScriptValue* value)
@@ -64,20 +64,20 @@
 
 bool ScriptValue::getString(String& result) const
 {
-    if (m_value.isEmpty())
+    if (hasNoValue())
         return false;
 
-    if (!m_value->IsString())
+    if (!v8ValueRaw()->IsString())
         return false;
 
-    result = toWebCoreString(m_value.get());
+    result = toWebCoreString(v8ValueRaw());
     return true;
 }
 
 String ScriptValue::toString(ScriptState*) const
 {
     v8::TryCatch block;
-    v8::Handle<v8::String> string = m_value->ToString();
+    v8::Handle<v8::String> string = v8ValueRaw()->ToString();
     if (block.HasCaught())
         return String();
     return v8StringToWebCoreString<String>(string, DoNotExternalize);
@@ -142,7 +142,7 @@
     v8::HandleScope handleScope;
     // v8::Object::GetPropertyNames() expects current context to be not null.
     v8::Context::Scope contextScope(scriptState->context());
-    return v8ToInspectorValue(m_value.get(), InspectorValue::maxDepth);
+    return v8ToInspectorValue(v8ValueRaw(), InspectorValue::maxDepth);
 }
 #endif