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

Unified Diff: Source/bindings/tests/results/V8TestSpecialOperationsInt.cpp

Issue 217053007: Revert of Make DOMWrapperWorld::current() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert 213543004 too Created 6 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
Index: Source/bindings/tests/results/V8TestSpecialOperationsInt.cpp
diff --git a/Source/bindings/tests/results/V8TestSpecialOperations.cpp b/Source/bindings/tests/results/V8TestSpecialOperationsInt.cpp
similarity index 54%
copy from Source/bindings/tests/results/V8TestSpecialOperations.cpp
copy to Source/bindings/tests/results/V8TestSpecialOperationsInt.cpp
index fde0cfbab7fb6c35335696a18874cf00fe4f26c9..a690b97a6e18150e37a3fe94bd2995d3c978d747 100644
--- a/Source/bindings/tests/results/V8TestSpecialOperations.cpp
+++ b/Source/bindings/tests/results/V8TestSpecialOperationsInt.cpp
@@ -5,11 +5,9 @@
// This file has been auto-generated by code_generator_v8.py. DO NOT MODIFY!
#include "config.h"
-#include "V8TestSpecialOperations.h"
+#include "V8TestSpecialOperationsInt.h"
#include "RuntimeEnabledFeatures.h"
-#include "V8Node.h"
-#include "V8NodeList.h"
#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8HiddenValue.h"
@@ -22,93 +20,96 @@
namespace WebCore {
-static void initializeScriptWrappableForInterface(TestSpecialOperations* object)
+static void initializeScriptWrappableForInterface(TestSpecialOperationsInt* object)
{
if (ScriptWrappable::wrapperCanBeStoredInObject(object))
- ScriptWrappable::setTypeInfoInObject(object, &V8TestSpecialOperations::wrapperTypeInfo);
+ ScriptWrappable::setTypeInfoInObject(object, &V8TestSpecialOperationsInt::wrapperTypeInfo);
else
ASSERT_NOT_REACHED();
}
} // namespace WebCore
-void webCoreInitializeScriptWrappableForInterface(WebCore::TestSpecialOperations* object)
+void webCoreInitializeScriptWrappableForInterface(WebCore::TestSpecialOperationsInt* object)
{
WebCore::initializeScriptWrappableForInterface(object);
}
namespace WebCore {
-const WrapperTypeInfo V8TestSpecialOperations::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestSpecialOperations::domTemplate, V8TestSpecialOperations::derefObject, 0, 0, 0, V8TestSpecialOperations::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype, false };
+const WrapperTypeInfo V8TestSpecialOperationsInt::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestSpecialOperationsInt::domTemplate, V8TestSpecialOperationsInt::derefObject, 0, 0, 0, V8TestSpecialOperationsInt::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype, false };
-namespace TestSpecialOperationsV8Internal {
+namespace TestSpecialOperationsIntV8Internal {
template <typename T> void V8_USE(T) { }
-static void namedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
+static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- if (UNLIKELY(info.Length() < 1)) {
- throwTypeError(ExceptionMessages::failedToExecute("namedItem", "TestSpecialOperations", ExceptionMessages::notEnoughArguments(1, info.Length())), info.GetIsolate());
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
+ int result = impl->anonymousIndexedGetter(index);
+ if ()
return;
- }
- TestSpecialOperations* impl = V8TestSpecialOperations::toNative(info.Holder());
- V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, name, info[0]);
- bool result0Enabled = false;
- RefPtr<Node> result0;
- bool result1Enabled = false;
- RefPtr<NodeList> result1;
- impl->getItem(name, result0Enabled, result0, result1Enabled, result1);
- if (result0Enabled) {
- v8SetReturnValue(info, result0.release());
- return;
- }
- if (result1Enabled) {
- v8SetReturnValue(info, result1.release());
+ v8SetReturnValueInt(info, result);
+}
+
+static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
+ TestSpecialOperationsIntV8Internal::indexedPropertyGetter(index, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
+}
+
+static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
+ V8TRYCATCH_EXCEPTION_VOID(unsigned, propertyValue, toUInt32(v8Value, exceptionState), exceptionState);
+ ExceptionState exceptionState(ExceptionState::IndexedSetterContext, "TestSpecialOperationsInt", info.Holder(), info.GetIsolate());
+ bool result = impl->anonymousIndexedSetter(index, propertyValue);
+ if (!result)
return;
- }
- v8SetReturnValueNull(info);
+ v8SetReturnValue(info, v8Value);
}
-static void namedItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
+static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
- TestSpecialOperationsV8Internal::namedItemMethod(info);
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
+ TestSpecialOperationsIntV8Internal::indexedPropertySetter(index, v8Value, info);
TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
}
static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TestSpecialOperations* impl = V8TestSpecialOperations::toNative(info.Holder());
- AtomicString propertyName = toCoreAtomicString(name);
- bool result0Enabled = false;
- RefPtr<Node> result0;
- bool result1Enabled = false;
- RefPtr<NodeList> result1;
- impl->getItem(propertyName, result0Enabled, result0, result1Enabled, result1);
- if (!result0Enabled && !result1Enabled)
+ if (info.Holder()->HasRealNamedProperty(name))
return;
- if (result0Enabled) {
- v8SetReturnValueFast(info, WTF::getPtr(result0.release()), impl);
+ if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
return;
- }
- if (result1Enabled) {
- v8SetReturnValueFast(info, WTF::getPtr(result1.release()), impl);
+
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
+ AtomicString propertyName = toCoreAtomicString(name);
+ int result = impl->anonymousNamedGetter(propertyName);
+ if ()
return;
- }
- v8SetReturnValueNull(info);
+ v8SetReturnValueInt(info, result);
}
static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
- TestSpecialOperationsV8Internal::namedPropertyGetter(name, info);
+ TestSpecialOperationsIntV8Internal::namedPropertyGetter(name, info);
TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
}
static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TestSpecialOperations* impl = V8TestSpecialOperations::toNative(info.Holder());
+ if (info.Holder()->HasRealNamedProperty(name))
+ return;
+ if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
+ return;
+
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyName, name);
- V8TRYCATCH_VOID(Node*, propertyValue, V8Node::toNativeWithTypeCheck(info.GetIsolate(), v8Value));
+ V8TRYCATCH_EXCEPTION_VOID(unsigned, propertyValue, toUInt32(v8Value, exceptionState), exceptionState);
+ v8::String::Utf8Value namedProperty(name);
+ ExceptionState exceptionState(ExceptionState::SetterContext, *namedProperty, "TestSpecialOperationsInt", info.Holder(), info.GetIsolate());
bool result = impl->anonymousNamedSetter(propertyName, propertyValue);
if (!result)
return;
@@ -118,16 +119,16 @@ static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value>
static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
- TestSpecialOperationsV8Internal::namedPropertySetter(name, v8Value, info);
+ TestSpecialOperationsIntV8Internal::namedPropertySetter(name, v8Value, info);
TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
}
static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
- TestSpecialOperations* impl = V8TestSpecialOperations::toNative(info.Holder());
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
AtomicString propertyName = toCoreAtomicString(name);
v8::String::Utf8Value namedProperty(name);
- ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestSpecialOperations", info.Holder(), info.GetIsolate());
+ ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestSpecialOperationsInt", info.Holder(), info.GetIsolate());
bool result = impl->namedPropertyQuery(propertyName, exceptionState);
if (exceptionState.throwIfNeeded())
return;
@@ -139,16 +140,16 @@ static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCal
static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
- TestSpecialOperationsV8Internal::namedPropertyQuery(name, info);
+ TestSpecialOperationsIntV8Internal::namedPropertyQuery(name, info);
TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
}
static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- TestSpecialOperations* impl = V8TestSpecialOperations::toNative(info.Holder());
+ TestSpecialOperationsInt* impl = V8TestSpecialOperationsInt::toNative(info.Holder());
v8::Isolate* isolate = info.GetIsolate();
Vector<String> names;
- ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestSpecialOperations", info.Holder(), isolate);
+ ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestSpecialOperationsInt", info.Holder(), isolate);
impl->namedPropertyEnumerator(names, exceptionState);
if (exceptionState.throwIfNeeded())
return;
@@ -161,35 +162,32 @@ static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& i
static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
{
TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
- TestSpecialOperationsV8Internal::namedPropertyEnumerator(info);
+ TestSpecialOperationsIntV8Internal::namedPropertyEnumerator(info);
TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
}
-} // namespace TestSpecialOperationsV8Internal
-
-static const V8DOMConfiguration::MethodConfiguration V8TestSpecialOperationsMethods[] = {
- {"namedItem", TestSpecialOperationsV8Internal::namedItemMethodCallback, 0, 1},
-};
+} // namespace TestSpecialOperationsIntV8Internal
-static void configureV8TestSpecialOperationsTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
+static void configureV8TestSpecialOperationsIntTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
{
functionTemplate->ReadOnlyPrototype();
v8::Local<v8::Signature> defaultSignature;
- defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestSpecialOperations", v8::Local<v8::FunctionTemplate>(), V8TestSpecialOperations::internalFieldCount,
+ defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestSpecialOperationsInt", v8::Local<v8::FunctionTemplate>(), V8TestSpecialOperationsInt::internalFieldCount,
+ 0, 0,
0, 0,
0, 0,
- V8TestSpecialOperationsMethods, WTF_ARRAY_LENGTH(V8TestSpecialOperationsMethods),
isolate);
v8::Local<v8::ObjectTemplate> ALLOW_UNUSED instanceTemplate = functionTemplate->InstanceTemplate();
v8::Local<v8::ObjectTemplate> ALLOW_UNUSED prototypeTemplate = functionTemplate->PrototypeTemplate();
- functionTemplate->InstanceTemplate()->SetNamedPropertyHandler(TestSpecialOperationsV8Internal::namedPropertyGetterCallback, TestSpecialOperationsV8Internal::namedPropertySetterCallback, TestSpecialOperationsV8Internal::namedPropertyQueryCallback, 0, TestSpecialOperationsV8Internal::namedPropertyEnumeratorCallback);
+ functionTemplate->InstanceTemplate()->SetIndexedPropertyHandler(TestSpecialOperationsIntV8Internal::indexedPropertyGetterCallback, TestSpecialOperationsIntV8Internal::indexedPropertySetterCallback, 0, 0, indexedPropertyEnumerator<TestSpecialOperationsInt>);
+ functionTemplate->InstanceTemplate()->SetNamedPropertyHandler(TestSpecialOperationsIntV8Internal::namedPropertyGetterCallback, TestSpecialOperationsIntV8Internal::namedPropertySetterCallback, TestSpecialOperationsIntV8Internal::namedPropertyQueryCallback, 0, TestSpecialOperationsIntV8Internal::namedPropertyEnumeratorCallback);
// Custom toString template
functionTemplate->Set(v8AtomicString(isolate, "toString"), V8PerIsolateData::current()->toStringTemplate());
}
-v8::Handle<v8::FunctionTemplate> V8TestSpecialOperations::domTemplate(v8::Isolate* isolate)
+v8::Handle<v8::FunctionTemplate> V8TestSpecialOperationsInt::domTemplate(v8::Isolate* isolate)
{
V8PerIsolateData* data = V8PerIsolateData::from(isolate);
v8::Local<v8::FunctionTemplate> result = data->existingDOMTemplate(const_cast<WrapperTypeInfo*>(&wrapperTypeInfo));
@@ -198,30 +196,30 @@ v8::Handle<v8::FunctionTemplate> V8TestSpecialOperations::domTemplate(v8::Isolat
TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
result = v8::FunctionTemplate::New(isolate, V8ObjectConstructor::isValidConstructorMode);
- configureV8TestSpecialOperationsTemplate(result, isolate);
+ configureV8TestSpecialOperationsIntTemplate(result, isolate);
data->setDOMTemplate(const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), result);
return result;
}
-bool V8TestSpecialOperations::hasInstance(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
+bool V8TestSpecialOperationsInt::hasInstance(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
{
return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, v8Value);
}
-v8::Handle<v8::Object> V8TestSpecialOperations::findInstanceInPrototypeChain(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
+v8::Handle<v8::Object> V8TestSpecialOperationsInt::findInstanceInPrototypeChain(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
{
return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, v8Value);
}
-TestSpecialOperations* V8TestSpecialOperations::toNativeWithTypeCheck(v8::Isolate* isolate, v8::Handle<v8::Value> value)
+TestSpecialOperationsInt* V8TestSpecialOperationsInt::toNativeWithTypeCheck(v8::Isolate* isolate, v8::Handle<v8::Value> value)
{
return hasInstance(value, isolate) ? fromInternalPointer(v8::Handle<v8::Object>::Cast(value)->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) : 0;
}
-v8::Handle<v8::Object> V8TestSpecialOperations::createWrapper(PassRefPtr<TestSpecialOperations> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
+v8::Handle<v8::Object> V8TestSpecialOperationsInt::createWrapper(PassRefPtr<TestSpecialOperationsInt> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(!DOMDataStore::containsWrapper<V8TestSpecialOperations>(impl.get(), isolate));
+ ASSERT(!DOMDataStore::containsWrapper<V8TestSpecialOperationsInt>(impl.get(), isolate));
if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl.get());
// Might be a XXXConstructor::wrapperTypeInfo instead of an XXX::wrapperTypeInfo. These will both have
@@ -234,17 +232,17 @@ v8::Handle<v8::Object> V8TestSpecialOperations::createWrapper(PassRefPtr<TestSpe
return wrapper;
installPerContextEnabledProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper<V8TestSpecialOperations>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestSpecialOperationsInt>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
-void V8TestSpecialOperations::derefObject(void* object)
+void V8TestSpecialOperationsInt::derefObject(void* object)
{
fromInternalPointer(object)->deref();
}
template<>
-v8::Handle<v8::Value> toV8NoInline(TestSpecialOperations* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
+v8::Handle<v8::Value> toV8NoInline(TestSpecialOperationsInt* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
return toV8(impl, creationContext, isolate);
}

Powered by Google App Engine
This is Rietveld 408576698