Index: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp |
index cbfc21cf08d5c6261d2f582d973edadf8e236678..16e07e0bd8376fe80616e8ba4c55b41e41ffcba8 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp |
@@ -1155,8 +1155,6 @@ ScriptValueSerializer::StateBase* ScriptValueSerializer::writeAndGreyArrayBuffer |
if (!arrayBufferView->bufferBase()) |
return handleError(Status::DataCloneError, "An ArrayBuffer could not be cloned.", next); |
v8::Local<v8::Value> underlyingBuffer = toV8(arrayBufferView->bufferBase(), m_scriptState->context()->Global(), isolate()); |
- if (underlyingBuffer.IsEmpty()) |
- return handleError(Status::DataCloneError, "An ArrayBuffer could not be cloned.", next); |
StateBase* stateOut = doSerializeArrayBuffer(underlyingBuffer, next); |
if (stateOut) |
return stateOut; |
@@ -1775,7 +1773,7 @@ bool SerializedScriptValueReader::readImageData(v8::Local<v8::Value>* value) |
if (!imageData) |
return false; |
*value = toV8(imageData, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readImageBitmap(v8::Local<v8::Value>* value) |
@@ -1798,7 +1796,7 @@ bool SerializedScriptValueReader::readImageBitmap(v8::Local<v8::Value>* value) |
if (!imageBitmap) |
return false; |
*value = toV8(imageBitmap, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readCompositorProxy(v8::Local<v8::Value>* value) |
@@ -1812,7 +1810,7 @@ bool SerializedScriptValueReader::readCompositorProxy(v8::Local<v8::Value>* valu |
CompositorProxy* compositorProxy = CompositorProxy::create(m_scriptState->getExecutionContext(), element, attributes); |
*value = toV8(compositorProxy, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
DOMArrayBuffer* SerializedScriptValueReader::doReadArrayBuffer() |
@@ -1833,7 +1831,7 @@ bool SerializedScriptValueReader::readArrayBuffer(v8::Local<v8::Value>* value) |
if (!arrayBuffer) |
return false; |
*value = toV8(arrayBuffer, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readArrayBufferView(v8::Local<v8::Value>* value, ScriptValueDeserializer& deserializer) |
@@ -1941,7 +1939,7 @@ bool SerializedScriptValueReader::readArrayBufferView(v8::Local<v8::Value>* valu |
*value = toV8(DOMDataView::create(arrayBuffer, byteOffset, byteLength), creationContext, isolate()); |
break; |
} |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readRegExp(v8::Local<v8::Value>* value) |
@@ -1986,7 +1984,7 @@ bool SerializedScriptValueReader::readBlob(v8::Local<v8::Value>* value, bool isI |
blob = Blob::create(getOrCreateBlobDataHandle(uuid, type, size)); |
} |
*value = toV8(blob, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readFile(v8::Local<v8::Value>* value, bool isIndexed) |
@@ -2002,7 +2000,7 @@ bool SerializedScriptValueReader::readFile(v8::Local<v8::Value>* value, bool isI |
if (!file) |
return false; |
*value = toV8(file, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
bool SerializedScriptValueReader::readFileList(v8::Local<v8::Value>* value, bool isIndexed) |
@@ -2027,7 +2025,7 @@ bool SerializedScriptValueReader::readFileList(v8::Local<v8::Value>* value, bool |
fileList->append(file); |
} |
*value = toV8(fileList, m_scriptState->context()->Global(), isolate()); |
- return !value->IsEmpty(); |
+ return true; |
} |
File* SerializedScriptValueReader::readFileHelper() |
@@ -2301,7 +2299,7 @@ bool ScriptValueDeserializer::tryGetTransferredMessagePort(uint32_t index, v8::L |
return false; |
v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global(); |
*object = toV8(m_transferredMessagePorts->at(index).get(), creationContext, m_reader.getScriptState()->isolate()); |
- return !object->IsEmpty(); |
+ return true; |
} |
bool ScriptValueDeserializer::tryGetTransferredArrayBuffer(uint32_t index, v8::Local<v8::Value>* object) |
@@ -2316,8 +2314,6 @@ bool ScriptValueDeserializer::tryGetTransferredArrayBuffer(uint32_t index, v8::L |
v8::Isolate* isolate = m_reader.getScriptState()->isolate(); |
v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global(); |
result = toV8(buffer, creationContext, isolate); |
- if (result.IsEmpty()) |
- return false; |
m_arrayBuffers[index] = result; |
} |
*object = result; |
@@ -2336,8 +2332,6 @@ bool ScriptValueDeserializer::tryGetTransferredImageBitmap(uint32_t index, v8::L |
v8::Isolate* isolate = m_reader.getScriptState()->isolate(); |
v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global(); |
result = toV8(bitmap, creationContext, isolate); |
- if (result.IsEmpty()) |
- return false; |
m_imageBitmaps[index] = result; |
} |
*object = result; |
@@ -2357,8 +2351,6 @@ bool ScriptValueDeserializer::tryGetTransferredSharedArrayBuffer(uint32_t index, |
v8::Isolate* isolate = m_reader.getScriptState()->isolate(); |
v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global(); |
result = toV8(buffer, creationContext, isolate); |
- if (result.IsEmpty()) |
- return false; |
m_arrayBuffers[index] = result; |
} |
*object = result; |
@@ -2371,8 +2363,6 @@ bool ScriptValueDeserializer::tryGetTransferredOffscreenCanvas(uint32_t index, u |
offscreenCanvas->setAssociatedCanvasId(canvasId); |
offscreenCanvas->setSurfaceId(clientId, localId, nonce); |
*object = toV8(offscreenCanvas, m_reader.getScriptState()); |
- if ((*object).IsEmpty()) |
- return false; |
return true; |
} |