Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h ('k') | third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e6a30e49b90759c8b79fd5865de2c979b927d6fd..bb3c4133d8653be255d250029743d5d56584e895 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -1792,7 +1792,7 @@ bool SerializedScriptValueReader::readRegExp(v8::Local<v8::Value>* value)
uint32_t flags;
if (!doReadUint32(&flags))
return false;
- if (!v8::RegExp::New(scriptState()->context(), pattern.As<v8::String>(), static_cast<v8::RegExp::Flags>(flags)).ToLocal(value))
+ if (!v8::RegExp::New(getScriptState()->context(), pattern.As<v8::String>(), static_cast<v8::RegExp::Flags>(flags)).ToLocal(value))
return false;
return true;
}
@@ -1966,7 +1966,7 @@ PassRefPtr<BlobDataHandle> SerializedScriptValueReader::getOrCreateBlobDataHandl
v8::Local<v8::Value> ScriptValueDeserializer::deserialize()
{
- v8::Isolate* isolate = m_reader.scriptState()->isolate();
+ v8::Isolate* isolate = m_reader.getScriptState()->isolate();
if (!m_reader.readVersion(m_version) || m_version > SerializedScriptValue::wireFormatVersion)
return v8::Null(isolate);
m_reader.setVersion(m_version);
@@ -1983,28 +1983,28 @@ v8::Local<v8::Value> ScriptValueDeserializer::deserialize()
bool ScriptValueDeserializer::newSparseArray(uint32_t)
{
- v8::Local<v8::Array> array = v8::Array::New(m_reader.scriptState()->isolate(), 0);
+ v8::Local<v8::Array> array = v8::Array::New(m_reader.getScriptState()->isolate(), 0);
openComposite(array);
return true;
}
bool ScriptValueDeserializer::newDenseArray(uint32_t length)
{
- v8::Local<v8::Array> array = v8::Array::New(m_reader.scriptState()->isolate(), length);
+ v8::Local<v8::Array> array = v8::Array::New(m_reader.getScriptState()->isolate(), length);
openComposite(array);
return true;
}
bool ScriptValueDeserializer::newMap()
{
- v8::Local<v8::Map> map = v8::Map::New(m_reader.scriptState()->isolate());
+ v8::Local<v8::Map> map = v8::Map::New(m_reader.getScriptState()->isolate());
openComposite(map);
return true;
}
bool ScriptValueDeserializer::newSet()
{
- v8::Local<v8::Set> set = v8::Set::New(m_reader.scriptState()->isolate());
+ v8::Local<v8::Set> set = v8::Set::New(m_reader.getScriptState()->isolate());
openComposite(set);
return true;
}
@@ -2020,7 +2020,7 @@ bool ScriptValueDeserializer::consumeTopOfStack(v8::Local<v8::Value>* object)
bool ScriptValueDeserializer::newObject()
{
- v8::Local<v8::Object> object = v8::Object::New(m_reader.scriptState()->isolate());
+ v8::Local<v8::Object> object = v8::Object::New(m_reader.getScriptState()->isolate());
if (object.IsEmpty())
return false;
openComposite(object);
@@ -2036,7 +2036,7 @@ bool ScriptValueDeserializer::completeObject(uint32_t numProperties, v8::Local<v
return false;
object = composite.As<v8::Object>();
} else {
- object = v8::Object::New(m_reader.scriptState()->isolate());
+ object = v8::Object::New(m_reader.getScriptState()->isolate());
}
if (object.IsEmpty())
return false;
@@ -2052,7 +2052,7 @@ bool ScriptValueDeserializer::completeSparseArray(uint32_t numProperties, uint32
return false;
array = composite.As<v8::Array>();
} else {
- array = v8::Array::New(m_reader.scriptState()->isolate());
+ array = v8::Array::New(m_reader.getScriptState()->isolate());
}
if (array.IsEmpty())
return false;
@@ -2074,7 +2074,7 @@ bool ScriptValueDeserializer::completeDenseArray(uint32_t numProperties, uint32_
return false;
if (length > stackDepth())
return false;
- v8::Local<v8::Context> context = m_reader.scriptState()->context();
+ v8::Local<v8::Context> context = m_reader.getScriptState()->context();
for (unsigned i = 0, stackPos = stackDepth() - length; i < length; i++, stackPos++) {
v8::Local<v8::Value> elem = element(stackPos);
if (!elem->IsUndefined()) {
@@ -2095,7 +2095,7 @@ bool ScriptValueDeserializer::completeMap(uint32_t length, v8::Local<v8::Value>*
v8::Local<v8::Map> map = composite.As<v8::Map>();
if (map.IsEmpty())
return false;
- v8::Local<v8::Context> context = m_reader.scriptState()->context();
+ v8::Local<v8::Context> context = m_reader.getScriptState()->context();
ASSERT(length % 2 == 0);
for (unsigned i = stackDepth() - length; i + 1 < stackDepth(); i += 2) {
v8::Local<v8::Value> key = element(i);
@@ -2117,7 +2117,7 @@ bool ScriptValueDeserializer::completeSet(uint32_t length, v8::Local<v8::Value>*
v8::Local<v8::Set> set = composite.As<v8::Set>();
if (set.IsEmpty())
return false;
- v8::Local<v8::Context> context = m_reader.scriptState()->context();
+ v8::Local<v8::Context> context = m_reader.getScriptState()->context();
for (unsigned i = stackDepth() - length; i < stackDepth(); i++) {
v8::Local<v8::Value> key = element(i);
if (set->Add(context, key).IsEmpty())
@@ -2139,8 +2139,8 @@ bool ScriptValueDeserializer::tryGetTransferredMessagePort(uint32_t index, v8::L
return false;
if (index >= m_transferredMessagePorts->size())
return false;
- v8::Local<v8::Object> creationContext = m_reader.scriptState()->context()->Global();
- *object = toV8(m_transferredMessagePorts->at(index).get(), creationContext, m_reader.scriptState()->isolate());
+ 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();
}
@@ -2153,8 +2153,8 @@ bool ScriptValueDeserializer::tryGetTransferredArrayBuffer(uint32_t index, v8::L
v8::Local<v8::Value> result = m_arrayBuffers.at(index);
if (result.IsEmpty()) {
RefPtr<DOMArrayBuffer> buffer = DOMArrayBuffer::create(m_arrayBufferContents->at(index));
- v8::Isolate* isolate = m_reader.scriptState()->isolate();
- v8::Local<v8::Object> creationContext = m_reader.scriptState()->context()->Global();
+ v8::Isolate* isolate = m_reader.getScriptState()->isolate();
+ v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global();
result = toV8(buffer.get(), creationContext, isolate);
if (result.IsEmpty())
return false;
@@ -2173,8 +2173,8 @@ bool ScriptValueDeserializer::tryGetTransferredImageBitmap(uint32_t index, v8::L
v8::Local<v8::Value> result = m_imageBitmaps.at(index);
if (result.IsEmpty()) {
RefPtrWillBeRawPtr<ImageBitmap> bitmap = ImageBitmap::create(m_imageBitmapContents->at(index));
- v8::Isolate* isolate = m_reader.scriptState()->isolate();
- v8::Local<v8::Object> creationContext = m_reader.scriptState()->context()->Global();
+ v8::Isolate* isolate = m_reader.getScriptState()->isolate();
+ v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global();
result = toV8(bitmap.get(), creationContext, isolate);
if (result.IsEmpty())
return false;
@@ -2194,8 +2194,8 @@ bool ScriptValueDeserializer::tryGetTransferredSharedArrayBuffer(uint32_t index,
v8::Local<v8::Value> result = m_arrayBuffers.at(index);
if (result.IsEmpty()) {
RefPtr<DOMSharedArrayBuffer> buffer = DOMSharedArrayBuffer::create(m_arrayBufferContents->at(index));
- v8::Isolate* isolate = m_reader.scriptState()->isolate();
- v8::Local<v8::Object> creationContext = m_reader.scriptState()->context()->Global();
+ v8::Isolate* isolate = m_reader.getScriptState()->isolate();
+ v8::Local<v8::Object> creationContext = m_reader.getScriptState()->context()->Global();
result = toV8(buffer.get(), creationContext, isolate);
if (result.IsEmpty())
return false;
@@ -2223,7 +2223,7 @@ bool ScriptValueDeserializer::initializeObject(v8::Local<v8::Object> object, uin
unsigned length = 2 * numProperties;
if (length > stackDepth())
return false;
- v8::Local<v8::Context> context = m_reader.scriptState()->context();
+ v8::Local<v8::Context> context = m_reader.getScriptState()->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);
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h ('k') | third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698