Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ib07d03553a1e81485ac4ffc92b91e977c4875409
diff --git a/Source/bindings/tests/idls/TestEventTarget.idl b/Source/bindings/tests/idls/TestEventTarget.idl
index 6fae84c..76aed9d 100644
--- a/Source/bindings/tests/idls/TestEventTarget.idl
+++ b/Source/bindings/tests/idls/TestEventTarget.idl
@@ -27,22 +27,14 @@
*/
[
- EventTarget,
MasqueradesAsUndefined
-] interface TestEventTarget {
+] interface TestEventTarget : EventTarget {
getter Node item([IsIndex] unsigned long index);
+ [ImplementedAs=anonymousIndexedSetter] setter Node (unsigned long index, Node node);
getter Node namedItem(DOMString name);
[ImplementedAs=anonymousNamedSetter] setter Node(DOMString name, [TreatUndefinedAs=anonymousNamedSetterUndefined] DOMString value);
[ImplementedAs=anonymousIndexedDeleter, RaisesException] deleter boolean(unsigned long index);
[ImplementedAs=anonymousNamedDeleter] deleter boolean(DOMString name);
-
- void addEventListener(DOMString type,
- EventListener listener,
- optional boolean useCapture);
- void removeEventListener(DOMString type,
- EventListener listener,
- optional boolean useCapture);
- [RaisesException] boolean dispatchEvent(Event evt);
};
diff --git a/Source/bindings/tests/idls/TestNode.idl b/Source/bindings/tests/idls/TestNode.idl
index efb6b30..6231c1f 100644
--- a/Source/bindings/tests/idls/TestNode.idl
+++ b/Source/bindings/tests/idls/TestNode.idl
@@ -19,7 +19,6 @@
*/
[
- EventTarget,
Constructor,
DependentLifetime
] interface TestNode : Node {
diff --git a/Source/bindings/tests/results/V8Float64Array.cpp b/Source/bindings/tests/results/V8Float64Array.cpp
index 40a5de4..094bc29 100644
--- a/Source/bindings/tests/results/V8Float64Array.cpp
+++ b/Source/bindings/tests/results/V8Float64Array.cpp
@@ -25,6 +25,7 @@
#include "V8ArrayBufferView.h"
#include "V8Float32Array.h"
#include "V8Int32Array.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
@@ -34,11 +35,9 @@
#include "bindings/v8/custom/V8ArrayBufferViewCustom.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/GetPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
#include "wtf/UnusedParam.h"
@@ -84,9 +83,9 @@
static void fooMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
Float64ArrayV8Internal::fooMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void setMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -96,9 +95,9 @@
static void setMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
Float64ArrayV8Internal::setMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -108,16 +107,16 @@
static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
V8Float64Array::indexedPropertyGetterCustom(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
V8Float64Array::indexedPropertySetterCustom(index, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace Float64ArrayV8Internal
@@ -137,7 +136,7 @@
void V8Float64Array::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -186,7 +185,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8Float64ArrayTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -210,10 +209,9 @@
v8::Handle<v8::Object> V8Float64Array::createWrapper(PassRefPtr<Float64Array> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
- ASSERT(static_cast<void*>(static_cast<ArrayBufferView*>(impl.get())) == static_cast<void*>(impl.get()));
+ ASSERT(DOMDataStore::getWrapper<V8Float64Array>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
if (!impl->buffer()->hasDeallocationObserver()) {
@@ -221,12 +219,12 @@
impl->buffer()->setDeallocationObserver(V8ArrayBufferDeallocationObserver::instance());
}
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8Float64Array>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8Float64Array::derefObject(void* object)
{
- static_cast<Float64Array*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8Float64Array.h b/Source/bindings/tests/results/V8Float64Array.h
index 6f690c8..6b5deae 100644
--- a/Source/bindings/tests/results/V8Float64Array.h
+++ b/Source/bindings/tests/results/V8Float64Array.h
@@ -36,7 +36,7 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static Float64Array* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<Float64Array*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
@@ -44,6 +44,15 @@
static void indexedPropertyGetterCustom(uint32_t, const v8::PropertyCallbackInfo<v8::Value>&);
static void indexedPropertySetterCustom(uint32_t, v8::Local<v8::Value>, const v8::PropertyCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(Float64Array* impl)
+ {
+ return V8ArrayBufferView::toInternalPointer(impl);
+ }
+
+ static inline Float64Array* fromInternalPointer(void* object)
+ {
+ return static_cast<Float64Array*>(V8ArrayBufferView::fromInternalPointer(object));
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, Float64Array*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -64,7 +73,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8Float64Array>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -75,46 +84,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8Float64Array>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(Float64Array* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(Float64Array* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8Float64Array>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(Float64Array* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(Float64Array* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8Float64Array>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< Float64Array > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< Float64Array > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< Float64Array > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< Float64Array > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< Float64Array > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestActiveDOMObject.cpp b/Source/bindings/tests/results/V8TestActiveDOMObject.cpp
index 49705bd..e055b2e 100644
--- a/Source/bindings/tests/results/V8TestActiveDOMObject.cpp
+++ b/Source/bindings/tests/results/V8TestActiveDOMObject.cpp
@@ -24,13 +24,13 @@
#include "RuntimeEnabledFeatures.h"
#include "V8Node.h"
#include "bindings/v8/BindingSecurity.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8DOMWrapper.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/UnusedParam.h"
@@ -72,7 +72,9 @@
static void excitingAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestActiveDOMObjectV8Internal::excitingAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
bool indexedSecurityCheck(v8::Local<v8::Object> host, uint32_t index, v8::AccessType type, v8::Local<v8::Value>)
@@ -104,9 +106,9 @@
static void excitingFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestActiveDOMObjectV8Internal::excitingFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void postMessageMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -124,9 +126,9 @@
static void postMessageMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestActiveDOMObjectV8Internal::postMessageMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void postMessageAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -163,7 +165,9 @@
static void postMessageAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestActiveDOMObjectV8Internal::postMessageAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void TestActiveDOMObjectDomainSafeFunctionSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -221,7 +225,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestActiveDOMObjectTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -245,18 +249,18 @@
v8::Handle<v8::Object> V8TestActiveDOMObject::createWrapper(PassRefPtr<TestActiveDOMObject> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestActiveDOMObject>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestActiveDOMObject>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestActiveDOMObject::derefObject(void* object)
{
- static_cast<TestActiveDOMObject*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestActiveDOMObject.h b/Source/bindings/tests/results/V8TestActiveDOMObject.h
index 13e1222..e39896c 100644
--- a/Source/bindings/tests/results/V8TestActiveDOMObject.h
+++ b/Source/bindings/tests/results/V8TestActiveDOMObject.h
@@ -35,11 +35,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestActiveDOMObject* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestActiveDOMObject*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestActiveDOMObject* impl)
+ {
+ return impl;
+ }
+
+ static inline TestActiveDOMObject* fromInternalPointer(void* object)
+ {
+ return static_cast<TestActiveDOMObject*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestActiveDOMObject*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -57,7 +66,7 @@
inline v8::Handle<v8::Object> wrap(TestActiveDOMObject* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestActiveDOMObject>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -71,7 +80,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestActiveDOMObject>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -82,46 +91,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestActiveDOMObject>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestActiveDOMObject* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestActiveDOMObject* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestActiveDOMObject>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestActiveDOMObject* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestActiveDOMObject* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestActiveDOMObject>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestActiveDOMObject > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestActiveDOMObject > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestActiveDOMObject > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestActiveDOMObject > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestActiveDOMObject > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestCallback.cpp b/Source/bindings/tests/results/V8TestCallback.cpp
index 1b950b5..c582447 100644
--- a/Source/bindings/tests/results/V8TestCallback.cpp
+++ b/Source/bindings/tests/results/V8TestCallback.cpp
@@ -28,7 +28,6 @@
#include "core/dom/ScriptExecutionContext.h"
#include "wtf/Assertions.h"
#include "wtf/GetPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
namespace WebCore {
@@ -218,7 +217,7 @@
return !invokeCallback(m_callback.newLocal(isolate), 1, argv, callbackReturnValue, scriptExecutionContext());
}
-bool V8TestCallback::callbackWithThisArg(int param, ScriptValue thisValue)
+bool V8TestCallback::callbackWithThisArg(ScriptValue thisValue, int param)
{
if (!canInvokeCallback())
return true;
@@ -232,12 +231,6 @@
v8::Context::Scope scope(v8Context);
- v8::Handle<v8::Value> paramHandle = v8::Integer::New(param, isolate);
- if (paramHandle.IsEmpty()) {
- if (!isScriptControllerTerminating())
- CRASH();
- return true;
- }
v8::Handle<v8::Value> thisHandle = thisValue.v8Value();
if (thisHandle.IsEmpty()) {
if (!isScriptControllerTerminating())
@@ -245,6 +238,12 @@
return true;
}
ASSERT(thisHandle->isObject());
+ v8::Handle<v8::Value> paramHandle = v8::Integer::New(param, isolate);
+ if (paramHandle.IsEmpty()) {
+ if (!isScriptControllerTerminating())
+ CRASH();
+ return true;
+ }
v8::Handle<v8::Value> argv[] = {
paramHandle
diff --git a/Source/bindings/tests/results/V8TestCallback.h b/Source/bindings/tests/results/V8TestCallback.h
index 4f1af6f..7dd3e8d 100644
--- a/Source/bindings/tests/results/V8TestCallback.h
+++ b/Source/bindings/tests/results/V8TestCallback.h
@@ -50,7 +50,7 @@
virtual bool callbackWithStringList(RefPtr<DOMStringList> listParam);
virtual bool callbackWithBoolean(bool boolParam);
virtual bool callbackWithSequence(Vector<RefPtr<TestObj> > sequenceParam);
- virtual bool callbackWithThisArg(int param, ScriptValue thisValue);
+ virtual bool callbackWithThisArg(ScriptValue thisValue, int param);
virtual ScriptExecutionContext* scriptExecutionContext() const { return ContextLifecycleObserver::scriptExecutionContext(); }
diff --git a/Source/bindings/tests/results/V8TestCustomAccessors.cpp b/Source/bindings/tests/results/V8TestCustomAccessors.cpp
index b15549f..4687787 100644
--- a/Source/bindings/tests/results/V8TestCustomAccessors.cpp
+++ b/Source/bindings/tests/results/V8TestCustomAccessors.cpp
@@ -22,13 +22,13 @@
#include "V8TestCustomAccessors.h"
#include "RuntimeEnabledFeatures.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8DOMWrapper.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/UnusedParam.h"
@@ -76,65 +76,65 @@
static void anotherFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestCustomAccessorsV8Internal::anotherFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
V8TestCustomAccessors::indexedPropertyGetterCustom(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
V8TestCustomAccessors::indexedPropertySetterCustom(index, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
V8TestCustomAccessors::indexedPropertyDeleterCustom(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestCustomAccessors::namedPropertyGetterCustom(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestCustomAccessors::namedPropertySetterCustom(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyDeleterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestCustomAccessors::namedPropertyDeleterCustom(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestCustomAccessors::namedPropertyEnumeratorCustom(info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestCustomAccessors::namedPropertyQueryCustom(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestCustomAccessorsV8Internal
@@ -171,7 +171,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestCustomAccessorsTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -195,18 +195,18 @@
v8::Handle<v8::Object> V8TestCustomAccessors::createWrapper(PassRefPtr<TestCustomAccessors> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestCustomAccessors>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestCustomAccessors>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestCustomAccessors::derefObject(void* object)
{
- static_cast<TestCustomAccessors*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestCustomAccessors.h b/Source/bindings/tests/results/V8TestCustomAccessors.h
index 25b9db6..69d658c 100644
--- a/Source/bindings/tests/results/V8TestCustomAccessors.h
+++ b/Source/bindings/tests/results/V8TestCustomAccessors.h
@@ -35,7 +35,7 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestCustomAccessors* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestCustomAccessors*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
@@ -48,6 +48,15 @@
static void namedPropertyEnumeratorCustom(const v8::PropertyCallbackInfo<v8::Array>&);
static void namedPropertyQueryCustom(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Integer>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestCustomAccessors* impl)
+ {
+ return impl;
+ }
+
+ static inline TestCustomAccessors* fromInternalPointer(void* object)
+ {
+ return static_cast<TestCustomAccessors*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestCustomAccessors*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -65,7 +74,7 @@
inline v8::Handle<v8::Object> wrap(TestCustomAccessors* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestCustomAccessors>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -79,7 +88,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestCustomAccessors>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -90,46 +99,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestCustomAccessors>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestCustomAccessors* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestCustomAccessors* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestCustomAccessors>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestCustomAccessors* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestCustomAccessors* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestCustomAccessors>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestCustomAccessors > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestCustomAccessors > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestCustomAccessors > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestCustomAccessors > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestCustomAccessors > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestEvent.cpp b/Source/bindings/tests/results/V8TestEvent.cpp
index 0a59329..a1b9b30 100644
--- a/Source/bindings/tests/results/V8TestEvent.cpp
+++ b/Source/bindings/tests/results/V8TestEvent.cpp
@@ -85,7 +85,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestEventTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -109,19 +109,18 @@
v8::Handle<v8::Object> V8TestEvent::createWrapper(PassRefPtr<TestEvent> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
- ASSERT(static_cast<void*>(static_cast<Event*>(impl.get())) == static_cast<void*>(impl.get()));
+ ASSERT(DOMDataStore::getWrapper<V8TestEvent>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestEvent>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestEvent::derefObject(void* object)
{
- static_cast<TestEvent*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestEvent.h b/Source/bindings/tests/results/V8TestEvent.h
index 467ef74..fa2a0b3 100644
--- a/Source/bindings/tests/results/V8TestEvent.h
+++ b/Source/bindings/tests/results/V8TestEvent.h
@@ -36,11 +36,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestEvent* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestEvent*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestEvent* impl)
+ {
+ return V8Event::toInternalPointer(impl);
+ }
+
+ static inline TestEvent* fromInternalPointer(void* object)
+ {
+ return static_cast<TestEvent*>(V8Event::fromInternalPointer(object));
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestEvent*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -58,7 +67,7 @@
inline v8::Handle<v8::Object> wrap(TestEvent* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestEvent>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -72,7 +81,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestEvent>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -83,46 +92,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEvent>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestEvent* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestEvent* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestEvent>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEvent* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEvent* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEvent>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEvent > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEvent > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEvent > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEvent > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestEvent > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestEventConstructor.cpp b/Source/bindings/tests/results/V8TestEventConstructor.cpp
index a0e95a0..0fbf161 100644
--- a/Source/bindings/tests/results/V8TestEventConstructor.cpp
+++ b/Source/bindings/tests/results/V8TestEventConstructor.cpp
@@ -65,25 +65,29 @@
static void attr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestEventConstructor* imp = V8TestEventConstructor::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->attr1(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->attr1(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void attr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestEventConstructorV8Internal::attr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestEventConstructor* imp = V8TestEventConstructor::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->attr2(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->attr2(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void attr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestEventConstructorV8Internal::attr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -104,8 +108,8 @@
RefPtr<TestEventConstructor> event = TestEventConstructor::create(type, eventInit);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(event.release(), &V8TestEventConstructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
- args.GetReturnValue().Set(wrapper);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestEventConstructor>(event.release(), &V8TestEventConstructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ v8SetReturnValue(args, wrapper);
}
} // namespace TestEventConstructorV8Internal
@@ -124,7 +128,7 @@
void V8TestEventConstructor::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -162,7 +166,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestEventConstructorTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -186,18 +190,18 @@
v8::Handle<v8::Object> V8TestEventConstructor::createWrapper(PassRefPtr<TestEventConstructor> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestEventConstructor>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestEventConstructor>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestEventConstructor::derefObject(void* object)
{
- static_cast<TestEventConstructor*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestEventConstructor.h b/Source/bindings/tests/results/V8TestEventConstructor.h
index 517ebdc..0dfe158 100644
--- a/Source/bindings/tests/results/V8TestEventConstructor.h
+++ b/Source/bindings/tests/results/V8TestEventConstructor.h
@@ -36,12 +36,21 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestEventConstructor* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestEventConstructor*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static void constructorCallback(const v8::FunctionCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestEventConstructor* impl)
+ {
+ return impl;
+ }
+
+ static inline TestEventConstructor* fromInternalPointer(void* object)
+ {
+ return static_cast<TestEventConstructor*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestEventConstructor*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -59,7 +68,7 @@
inline v8::Handle<v8::Object> wrap(TestEventConstructor* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestEventConstructor>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -73,7 +82,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestEventConstructor>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -84,46 +93,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEventConstructor>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestEventConstructor* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestEventConstructor* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestEventConstructor>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEventConstructor* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEventConstructor* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEventConstructor>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEventConstructor > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEventConstructor > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEventConstructor > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEventConstructor > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestEventConstructor > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestEventTarget.cpp b/Source/bindings/tests/results/V8TestEventTarget.cpp
index d716404..148941e 100644
--- a/Source/bindings/tests/results/V8TestEventTarget.cpp
+++ b/Source/bindings/tests/results/V8TestEventTarget.cpp
@@ -22,18 +22,20 @@
#include "V8TestEventTarget.h"
#include "RuntimeEnabledFeatures.h"
-#include "V8Event.h"
+#include "V8EventTarget.h"
#include "V8Node.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8DOMWrapper.h"
-#include "bindings/v8/V8EventListenerList.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
+#include "wtf/GetPtr.h"
+#include "wtf/RefPtr.h"
#include "wtf/UnusedParam.h"
namespace WebCore {
@@ -58,7 +60,7 @@
}
namespace WebCore {
-WrapperTypeInfo V8TestEventTarget::info = { V8TestEventTarget::GetTemplate, V8TestEventTarget::derefObject, 0, V8TestEventTarget::toEventTarget, 0, V8TestEventTarget::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
+WrapperTypeInfo V8TestEventTarget::info = { V8TestEventTarget::GetTemplate, V8TestEventTarget::derefObject, 0, V8TestEventTarget::toEventTarget, 0, V8TestEventTarget::installPerContextPrototypeProperties, &V8EventTarget::info, WrapperTypeObjectPrototype };
namespace TestEventTargetV8Internal {
@@ -71,10 +73,10 @@
return;
}
TestEventTarget* imp = V8TestEventTarget::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_VOID(int, index, toUInt32(args[0]));
if (UNLIKELY(index < 0)) {
- setDOMException(INDEX_SIZE_ERR, args.GetIsolate());
+ setDOMException(IndexSizeError, args.GetIsolate());
return;
}
v8SetReturnValue(args, toV8(imp->item(index), args.Holder(), args.GetIsolate()));
@@ -83,9 +85,9 @@
static void itemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestEventTargetV8Internal::itemMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -102,68 +104,9 @@
static void namedItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestEventTargetV8Internal::namedItemMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
-}
-
-static void addEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOrCreate);
- if (listener) {
- V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestEventTarget::toNative(args.Holder())->addEventListener(stringResource, listener, args[2]->BooleanValue());
- createHiddenDependency(args.Holder(), args[1], V8TestEventTarget::eventListenerCacheIndex, args.GetIsolate());
- }
-}
-
-static void addEventListenerMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
- TestEventTargetV8Internal::addEventListenerMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
-}
-
-static void removeEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOnly);
- if (listener) {
- V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestEventTarget::toNative(args.Holder())->removeEventListener(stringResource, listener.get(), args[2]->BooleanValue());
- removeHiddenDependency(args.Holder(), args[1], V8TestEventTarget::eventListenerCacheIndex, args.GetIsolate());
- }
-}
-
-static void removeEventListenerMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
- TestEventTargetV8Internal::removeEventListenerMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
-}
-
-static void dispatchEventMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- if (args.Length() < 1) {
- throwNotEnoughArgumentsError(args.GetIsolate());
- return;
- }
- TestEventTarget* imp = V8TestEventTarget::toNative(args.Holder());
- ExceptionCode ec = 0;
- V8TRYCATCH_VOID(Event*, evt, V8Event::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8Event::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
- bool result = imp->dispatchEvent(evt, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
- return;
- }
- v8SetReturnValueBool(args, result);
- return;
-}
-
-static void dispatchEventMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
-{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
- TestEventTargetV8Internal::dispatchEventMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -178,28 +121,43 @@
static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
TestEventTargetV8Internal::indexedPropertyGetter(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
+}
+
+static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+ TestEventTarget* collection = V8TestEventTarget::toNative(info.Holder());
+ V8TRYCATCH_VOID(Node*, propertyValue, V8Node::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
+ bool result = collection->anonymousIndexedSetter(index, propertyValue);
+ if (!result)
+ return;
+ v8SetReturnValue(info, value);
+}
+
+static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
+ TestEventTargetV8Internal::indexedPropertySetter(index, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void indexedPropertyDeleter(unsigned index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
{
TestEventTarget* collection = V8TestEventTarget::toNative(info.Holder());
- ExceptionCode ec = 0;
- bool result = collection->anonymousIndexedDeleter(index, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ bool result = collection->anonymousIndexedDeleter(index, es);
+ if (es.throwIfNeeded())
return;
- }
return v8SetReturnValueBool(info, result);
}
static void indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
TestEventTargetV8Internal::indexedPropertyDeleter(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -222,9 +180,9 @@
static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestEventTargetV8Internal::namedPropertyGetter(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -250,9 +208,9 @@
static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestEventTargetV8Internal::namedPropertySetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
@@ -265,21 +223,19 @@
static void namedPropertyDeleterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestEventTargetV8Internal::namedPropertyDeleter(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
TestEventTarget* collection = V8TestEventTarget::toNative(info.Holder());
Vector<String> names;
- collection->namedPropertyEnumerator(names, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ collection->namedPropertyEnumerator(names, es);
+ if (es.throwIfNeeded())
return;
- }
v8::Handle<v8::Array> v8names = v8::Array::New(names.size());
for (size_t i = 0; i < names.size(); ++i)
v8names->Set(v8::Integer::New(i, info.GetIsolate()), v8String(names[i], info.GetIsolate()));
@@ -290,12 +246,10 @@
{
TestEventTarget* collection = V8TestEventTarget::toNative(info.Holder());
AtomicString propertyName = toWebCoreAtomicString(name);
- ExceptionCode ec = 0;
- bool result = collection->namedPropertyQuery(propertyName, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ bool result = collection->namedPropertyQuery(propertyName, es);
+ if (es.throwIfNeeded())
return;
- }
if (!result)
return;
v8SetReturnValueInt(info, v8::None);
@@ -303,16 +257,16 @@
static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestEventTargetV8Internal::namedPropertyEnumerator(info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestEventTargetV8Internal::namedPropertyQuery(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestEventTargetV8Internal
@@ -320,8 +274,6 @@
static const V8DOMConfiguration::BatchedMethod V8TestEventTargetMethods[] = {
{"item", TestEventTargetV8Internal::itemMethodCallback, 0, 1},
{"namedItem", TestEventTargetV8Internal::namedItemMethodCallback, 0, 1},
- {"addEventListener", TestEventTargetV8Internal::addEventListenerMethodCallback, 0, 2},
- {"removeEventListener", TestEventTargetV8Internal::removeEventListenerMethodCallback, 0, 2},
};
static v8::Handle<v8::FunctionTemplate> ConfigureV8TestEventTargetTemplate(v8::Handle<v8::FunctionTemplate> desc, v8::Isolate* isolate, WrapperWorldType currentWorldType)
@@ -329,7 +281,7 @@
desc->ReadOnlyPrototype();
v8::Local<v8::Signature> defaultSignature;
- defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestEventTarget", v8::Local<v8::FunctionTemplate>(), V8TestEventTarget::internalFieldCount,
+ defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestEventTarget", V8EventTarget::GetTemplate(isolate, currentWorldType), V8TestEventTarget::internalFieldCount,
0, 0,
V8TestEventTargetMethods, WTF_ARRAY_LENGTH(V8TestEventTargetMethods), isolate, currentWorldType);
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
@@ -337,16 +289,10 @@
v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
UNUSED_PARAM(instance); // In some cases, it will not be used.
UNUSED_PARAM(proto); // In some cases, it will not be used.
- desc->InstanceTemplate()->SetIndexedPropertyHandler(TestEventTargetV8Internal::indexedPropertyGetterCallback, 0, 0, TestEventTargetV8Internal::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestEventTarget>);
+ desc->InstanceTemplate()->SetIndexedPropertyHandler(TestEventTargetV8Internal::indexedPropertyGetterCallback, TestEventTargetV8Internal::indexedPropertySetterCallback, 0, TestEventTargetV8Internal::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestEventTarget>);
desc->InstanceTemplate()->SetNamedPropertyHandler(TestEventTargetV8Internal::namedPropertyGetterCallback, TestEventTargetV8Internal::namedPropertySetterCallback, TestEventTargetV8Internal::namedPropertyQueryCallback, TestEventTargetV8Internal::namedPropertyDeleterCallback, TestEventTargetV8Internal::namedPropertyEnumeratorCallback);
desc->InstanceTemplate()->MarkAsUndetectable();
- // Custom Signature 'dispatchEvent'
- const int dispatchEventArgc = 1;
- v8::Handle<v8::FunctionTemplate> dispatchEventArgv[dispatchEventArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Event::info, currentWorldType) };
- v8::Handle<v8::Signature> dispatchEventSignature = v8::Signature::New(desc, dispatchEventArgc, dispatchEventArgv);
- proto->Set(v8::String::NewSymbol("dispatchEvent"), v8::FunctionTemplate::New(TestEventTargetV8Internal::dispatchEventMethodCallback, v8Undefined(), dispatchEventSignature, 1));
-
// Custom toString template
desc->Set(v8::String::NewSymbol("toString"), V8PerIsolateData::current()->toStringTemplate());
return desc;
@@ -359,7 +305,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestEventTargetTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -388,18 +334,18 @@
v8::Handle<v8::Object> V8TestEventTarget::createWrapper(PassRefPtr<TestEventTarget> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestEventTarget>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestEventTarget>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestEventTarget::derefObject(void* object)
{
- static_cast<TestEventTarget*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestEventTarget.h b/Source/bindings/tests/results/V8TestEventTarget.h
index 67f6894..391c978 100644
--- a/Source/bindings/tests/results/V8TestEventTarget.h
+++ b/Source/bindings/tests/results/V8TestEventTarget.h
@@ -21,6 +21,7 @@
#ifndef V8TestEventTarget_h
#define V8TestEventTarget_h
+#include "V8EventTarget.h"
#include "bindings/bindings/tests/idls/TestEventTarget.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMWrapper.h"
@@ -35,13 +36,22 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestEventTarget* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestEventTarget*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static EventTarget* toEventTarget(v8::Handle<v8::Object>);
static const int eventListenerCacheIndex = v8DefaultWrapperInternalFieldCount + 0;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 1;
+ static inline void* toInternalPointer(TestEventTarget* impl)
+ {
+ return V8EventTarget::toInternalPointer(impl);
+ }
+
+ static inline TestEventTarget* fromInternalPointer(void* object)
+ {
+ return static_cast<TestEventTarget*>(V8EventTarget::fromInternalPointer(object));
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestEventTarget*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -59,7 +69,7 @@
inline v8::Handle<v8::Object> wrap(TestEventTarget* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestEventTarget>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -73,7 +83,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestEventTarget>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -84,46 +94,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEventTarget>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestEventTarget* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestEventTarget* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestEventTarget>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEventTarget* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestEventTarget* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestEventTarget>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEventTarget > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestEventTarget > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEventTarget > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestEventTarget > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestEventTarget > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestException.cpp b/Source/bindings/tests/results/V8TestException.cpp
index 54a8cc2..51d1173 100644
--- a/Source/bindings/tests/results/V8TestException.cpp
+++ b/Source/bindings/tests/results/V8TestException.cpp
@@ -63,13 +63,15 @@
static void nameAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestException* imp = V8TestException::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->name(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->name(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void nameAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestExceptionV8Internal::nameAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestExceptionV8Internal
@@ -101,7 +103,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestExceptionTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -125,18 +127,18 @@
v8::Handle<v8::Object> V8TestException::createWrapper(PassRefPtr<TestException> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestException>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestException>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestException::derefObject(void* object)
{
- static_cast<TestException*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestException.h b/Source/bindings/tests/results/V8TestException.h
index d2b54e5..3e85194 100644
--- a/Source/bindings/tests/results/V8TestException.h
+++ b/Source/bindings/tests/results/V8TestException.h
@@ -35,11 +35,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestException* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestException*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestException* impl)
+ {
+ return impl;
+ }
+
+ static inline TestException* fromInternalPointer(void* object)
+ {
+ return static_cast<TestException*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestException*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -57,7 +66,7 @@
inline v8::Handle<v8::Object> wrap(TestException* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestException>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -71,7 +80,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestException>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -82,46 +91,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestException>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestException* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestException* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestException>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestException* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestException* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestException>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestException > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestException > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestException > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestException > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestException > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestExtendedEvent.cpp b/Source/bindings/tests/results/V8TestExtendedEvent.cpp
index a0c4ab9..9cc2c4d 100644
--- a/Source/bindings/tests/results/V8TestExtendedEvent.cpp
+++ b/Source/bindings/tests/results/V8TestExtendedEvent.cpp
@@ -89,7 +89,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestExtendedEventTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -113,19 +113,18 @@
v8::Handle<v8::Object> V8TestExtendedEvent::createWrapper(PassRefPtr<Event> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
- ASSERT(static_cast<void*>(static_cast<Event*>(impl.get())) == static_cast<void*>(impl.get()));
+ ASSERT(DOMDataStore::getWrapper<V8TestExtendedEvent>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestExtendedEvent>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestExtendedEvent::derefObject(void* object)
{
- static_cast<Event*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestExtendedEvent.h b/Source/bindings/tests/results/V8TestExtendedEvent.h
index 0982d9e..82120e9 100644
--- a/Source/bindings/tests/results/V8TestExtendedEvent.h
+++ b/Source/bindings/tests/results/V8TestExtendedEvent.h
@@ -37,11 +37,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static Event* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<Event*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(Event* impl)
+ {
+ return V8TestEvent::toInternalPointer(impl);
+ }
+
+ static inline Event* fromInternalPointer(void* object)
+ {
+ return static_cast<Event*>(V8TestEvent::fromInternalPointer(object));
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, Event*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -59,7 +68,7 @@
inline v8::Handle<v8::Object> wrap(Event* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestExtendedEvent>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -73,7 +82,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestExtendedEvent>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -84,46 +93,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestExtendedEvent>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(Event* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(Event* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestExtendedEvent>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(Event* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(Event* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestExtendedEvent>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< Event > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< Event > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< Event > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< Event > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< Event > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
index 6d20691..b005bbb 100644
--- a/Source/bindings/tests/results/V8TestInterface.cpp
+++ b/Source/bindings/tests/results/V8TestInterface.cpp
@@ -27,6 +27,7 @@
#include "V8NodeList.h"
#include "V8TestObject.h"
#include "bindings/bindings/tests/idls/TestPartialInterface.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
@@ -34,11 +35,9 @@
#include "bindings/v8/V8ObjectConstructor.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/GetPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
#include "wtf/UnusedParam.h"
@@ -84,7 +83,9 @@
static void implementsStaticReadOnlyAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::implementsStaticReadOnlyAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -93,7 +94,7 @@
static void implementsStaticAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- v8SetReturnValue(info, v8String(TestInterface::implementsStaticAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, TestInterface::implementsStaticAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -103,7 +104,9 @@
static void implementsStaticAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::implementsStaticAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -123,9 +126,9 @@
static void implementsStaticAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::implementsStaticAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -135,7 +138,7 @@
static void implementsStr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestInterface* imp = V8TestInterface::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->implementsStr1(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->implementsStr1(), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -145,7 +148,9 @@
static void implementsStr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::implementsStr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -155,7 +160,7 @@
static void implementsStr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestInterface* imp = V8TestInterface::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->implementsStr2(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->implementsStr2(), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -165,7 +170,9 @@
static void implementsStr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::implementsStr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -186,9 +193,9 @@
static void implementsStr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::implementsStr2AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -197,7 +204,9 @@
static void implementsStr3AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8TestInterface::implementsStr3AttrGetterCustom(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -206,9 +215,9 @@
static void implementsStr3AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8TestInterface::implementsStr3AttrSetterCustom(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -228,7 +237,9 @@
static void implementsNodeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::implementsNodeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -249,9 +260,9 @@
static void implementsNodeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::implementsNodeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -271,7 +282,9 @@
static void Node23AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node23AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -292,9 +305,9 @@
static void Node23AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node23AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -314,7 +327,9 @@
static void Node24AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node24AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -335,9 +350,9 @@
static void Node24AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node24AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -357,7 +372,9 @@
static void Node25AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node25AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -378,9 +395,9 @@
static void Node25AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node25AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -399,7 +416,9 @@
static void supplementalStaticReadOnlyAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::supplementalStaticReadOnlyAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -408,7 +427,7 @@
static void supplementalStaticAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- v8SetReturnValue(info, v8String(TestPartialInterface::supplementalStaticAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, TestPartialInterface::supplementalStaticAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -418,7 +437,9 @@
static void supplementalStaticAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::supplementalStaticAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -438,9 +459,9 @@
static void supplementalStaticAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::supplementalStaticAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -450,7 +471,7 @@
static void supplementalStr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestInterface* imp = V8TestInterface::toNative(info.Holder());
- v8SetReturnValue(info, v8String(TestPartialInterface::supplementalStr1(imp), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, TestPartialInterface::supplementalStr1(imp), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -460,7 +481,9 @@
static void supplementalStr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::supplementalStr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -470,7 +493,7 @@
static void supplementalStr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestInterface* imp = V8TestInterface::toNative(info.Holder());
- v8SetReturnValue(info, v8String(TestPartialInterface::supplementalStr2(imp), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, TestPartialInterface::supplementalStr2(imp), info.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -480,7 +503,9 @@
static void supplementalStr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::supplementalStr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -501,9 +526,9 @@
static void supplementalStr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::supplementalStr2AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -512,7 +537,9 @@
static void supplementalStr3AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8TestInterface::supplementalStr3AttrGetterCustom(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -521,9 +548,9 @@
static void supplementalStr3AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8TestInterface::supplementalStr3AttrSetterCustom(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -543,7 +570,9 @@
static void supplementalNodeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::supplementalNodeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -564,9 +593,9 @@
static void supplementalNodeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::supplementalNodeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -586,7 +615,9 @@
static void Node13AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node13AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -607,9 +638,9 @@
static void Node13AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node13AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -629,7 +660,9 @@
static void Node14AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node14AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -650,9 +683,9 @@
static void Node14AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node14AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -672,7 +705,9 @@
static void Node15AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestInterfaceV8Internal::Node15AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -693,9 +728,9 @@
static void Node15AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestInterfaceV8Internal::Node15AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -716,9 +751,9 @@
static void implementsMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::implementsMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -732,15 +767,13 @@
return;
}
TestInterface* imp = V8TestInterface::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, strArg, args[0]);
V8TRYCATCH_VOID(TestObj*, objArg, V8TestObject::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate())) ? V8TestObject::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
ScriptExecutionContext* scriptContext = getScriptExecutionContext();
- RefPtr<TestObj> result = imp->implementsMethod2(scriptContext, strArg, objArg, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<TestObj> result = imp->implementsMethod2(scriptContext, strArg, objArg, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, toV8(result.release(), args.Holder(), args.GetIsolate()));
return;
}
@@ -751,9 +784,9 @@
static void implementsMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::implementsMethod2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -762,9 +795,9 @@
static void implementsMethod3MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8TestInterface::implementsMethod3MethodCustom(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -784,9 +817,9 @@
static void implementsMethod4MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::implementsMethod4Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition22) || ENABLE(Condition23)
@@ -807,9 +840,9 @@
static void supplementalMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::supplementalMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -823,15 +856,13 @@
return;
}
TestInterface* imp = V8TestInterface::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, strArg, args[0]);
V8TRYCATCH_VOID(TestObj*, objArg, V8TestObject::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate())) ? V8TestObject::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
ScriptExecutionContext* scriptContext = getScriptExecutionContext();
- RefPtr<TestObj> result = TestPartialInterface::supplementalMethod2(scriptContext, imp, strArg, objArg, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<TestObj> result = TestPartialInterface::supplementalMethod2(scriptContext, imp, strArg, objArg, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, toV8(result.release(), args.Holder(), args.GetIsolate()));
return;
}
@@ -842,9 +873,9 @@
static void supplementalMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::supplementalMethod2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -853,9 +884,9 @@
static void supplementalMethod3MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8TestInterface::supplementalMethod3MethodCustom(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -875,9 +906,9 @@
static void supplementalMethod4MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestInterfaceV8Internal::supplementalMethod4Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition11) || ENABLE(Condition12)
@@ -888,20 +919,18 @@
throwNotEnoughArgumentsError(args.GetIsolate());
return;
}
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str1, args[0]);
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str2, args[1]);
ScriptExecutionContext* context = getScriptExecutionContext();
- RefPtr<TestInterface> impl = TestInterface::create(context, str1, str2, ec);
+ RefPtr<TestInterface> impl = TestInterface::create(context, str1, str2, es);
v8::Handle<v8::Object> wrapper = args.Holder();
- if (ec) {
- setDOMException(ec, args.GetIsolate());
+ if (es.throwIfNeeded())
return;
- }
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestInterface::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestInterface>(impl.release(), &V8TestInterface::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -937,28 +966,26 @@
static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestInterfaceV8Internal::namedPropertyGetter(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
V8TestInterface::namedPropertySetterCustom(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
TestInterface* collection = V8TestInterface::toNative(info.Holder());
Vector<String> names;
- collection->namedPropertyEnumerator(names, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ collection->namedPropertyEnumerator(names, es);
+ if (es.throwIfNeeded())
return;
- }
v8::Handle<v8::Array> v8names = v8::Array::New(names.size());
for (size_t i = 0; i < names.size(); ++i)
v8names->Set(v8::Integer::New(i, info.GetIsolate()), v8String(names[i], info.GetIsolate()));
@@ -969,12 +996,10 @@
{
TestInterface* collection = V8TestInterface::toNative(info.Holder());
AtomicString propertyName = toWebCoreAtomicString(name);
- ExceptionCode ec = 0;
- bool result = collection->namedPropertyQuery(propertyName, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ bool result = collection->namedPropertyQuery(propertyName, es);
+ if (es.throwIfNeeded())
return;
- }
if (!result)
return;
v8SetReturnValueInt(info, v8::None);
@@ -982,16 +1007,16 @@
static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestInterfaceV8Internal::namedPropertyEnumerator(info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestInterfaceV8Internal::namedPropertyQuery(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestInterfaceV8Internal
@@ -1093,7 +1118,7 @@
void V8TestInterface::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -1179,7 +1204,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestInterfaceTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -1249,18 +1274,18 @@
v8::Handle<v8::Object> V8TestInterface::createWrapper(PassRefPtr<TestInterface> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestInterface>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestInterface>(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
return wrapper;
}
void V8TestInterface::derefObject(void* object)
{
- static_cast<TestInterface*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestInterface.h b/Source/bindings/tests/results/V8TestInterface.h
index 8ffd9c8..1bf6720 100644
--- a/Source/bindings/tests/results/V8TestInterface.h
+++ b/Source/bindings/tests/results/V8TestInterface.h
@@ -36,7 +36,7 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestInterface* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestInterface*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
@@ -44,6 +44,9 @@
#if ENABLE(Condition22) || ENABLE(Condition23)
static void implementsMethod3MethodCustom(const v8::FunctionCallbackInfo<v8::Value>&);
#endif // ENABLE(Condition22) || ENABLE(Condition23)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+ static void supplementalMethod3MethodCustom(const v8::FunctionCallbackInfo<v8::Value>&);
+#endif // ENABLE(Condition11) || ENABLE(Condition12)
static void constructorCallback(const v8::FunctionCallbackInfo<v8::Value>&);
#if ENABLE(Condition22) || ENABLE(Condition23)
static void implementsStr3AttrGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>&);
@@ -53,6 +56,15 @@
#endif // ENABLE(Condition22) || ENABLE(Condition23)
static void namedPropertySetterCustom(v8::Local<v8::String>, v8::Local<v8::Value>, const v8::PropertyCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestInterface* impl)
+ {
+ return impl;
+ }
+
+ static inline TestInterface* fromInternalPointer(void* object)
+ {
+ return static_cast<TestInterface*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestInterface*, v8::Isolate*);
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -70,7 +82,7 @@
inline v8::Handle<v8::Object> wrap(TestInterface* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestInterface>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -84,7 +96,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestInterface>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -95,46 +107,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestInterface>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestInterface* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestInterface* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestInterface>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestInterface* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestInterface* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestInterface>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestInterface > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestInterface > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestInterface > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestInterface > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestInterface > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestInterfaceImplementedAs.cpp b/Source/bindings/tests/results/V8TestInterfaceImplementedAs.cpp
index d2ae88c..f4054fd 100644
--- a/Source/bindings/tests/results/V8TestInterfaceImplementedAs.cpp
+++ b/Source/bindings/tests/results/V8TestInterfaceImplementedAs.cpp
@@ -22,17 +22,16 @@
#include "V8TestInterfaceImplementedAs.h"
#include "RuntimeEnabledFeatures.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8DOMWrapper.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/GetPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
#include "wtf/UnusedParam.h"
@@ -67,13 +66,15 @@
static void aAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
RealClass* imp = V8TestInterfaceImplementedAs::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->a(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->a(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void aAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
RealClassV8Internal::aAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void aAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -86,9 +87,9 @@
static void aAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
RealClassV8Internal::aAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void bAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -100,7 +101,9 @@
static void bAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
RealClassV8Internal::bAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void bAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -113,9 +116,9 @@
static void bAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
RealClassV8Internal::bAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void func1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -126,15 +129,15 @@
}
RealClass* imp = V8TestInterfaceImplementedAs::toNative(args.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, a, args[0]);
- v8SetReturnValue(args, v8String(imp->func1(a), args.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(args, imp->func1(a), args.GetIsolate(), NullStringAsEmpty);
return;
}
static void func1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
RealClassV8Internal::func1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void funcTestInterfaceImplementedAsParamMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -145,15 +148,15 @@
}
RealClass* imp = V8TestInterfaceImplementedAs::toNative(args.Holder());
V8TRYCATCH_VOID(RealClass*, orange, V8TestInterfaceImplementedAs::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8TestInterfaceImplementedAs::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
- v8SetReturnValue(args, v8String(imp->funcTestInterfaceImplementedAsParam(orange), args.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(args, imp->funcTestInterfaceImplementedAsParam(orange), args.GetIsolate(), NullStringAsEmpty);
return;
}
static void funcTestInterfaceImplementedAsParamMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
RealClassV8Internal::funcTestInterfaceImplementedAsParamMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace RealClassV8Internal
@@ -201,7 +204,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestInterfaceImplementedAsTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -225,18 +228,18 @@
v8::Handle<v8::Object> V8TestInterfaceImplementedAs::createWrapper(PassRefPtr<RealClass> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestInterfaceImplementedAs>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestInterfaceImplementedAs>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestInterfaceImplementedAs::derefObject(void* object)
{
- static_cast<RealClass*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestInterfaceImplementedAs.h b/Source/bindings/tests/results/V8TestInterfaceImplementedAs.h
index 483fa12..b63b467 100644
--- a/Source/bindings/tests/results/V8TestInterfaceImplementedAs.h
+++ b/Source/bindings/tests/results/V8TestInterfaceImplementedAs.h
@@ -35,11 +35,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static RealClass* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<RealClass*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(RealClass* impl)
+ {
+ return impl;
+ }
+
+ static inline RealClass* fromInternalPointer(void* object)
+ {
+ return static_cast<RealClass*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, RealClass*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -57,7 +66,7 @@
inline v8::Handle<v8::Object> wrap(RealClass* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestInterfaceImplementedAs>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -71,7 +80,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestInterfaceImplementedAs>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -82,46 +91,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestInterfaceImplementedAs>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(RealClass* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(RealClass* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestInterfaceImplementedAs>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(RealClass* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(RealClass* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestInterfaceImplementedAs>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< RealClass > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< RealClass > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< RealClass > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< RealClass > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< RealClass > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestMediaQueryListListener.cpp b/Source/bindings/tests/results/V8TestMediaQueryListListener.cpp
index faea1b2..424354d 100644
--- a/Source/bindings/tests/results/V8TestMediaQueryListListener.cpp
+++ b/Source/bindings/tests/results/V8TestMediaQueryListListener.cpp
@@ -22,6 +22,7 @@
#include "V8TestMediaQueryListListener.h"
#include "RuntimeEnabledFeatures.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
@@ -29,7 +30,6 @@
#include "core/css/MediaQueryListListener.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/UnusedParam.h"
@@ -77,9 +77,9 @@
static void methodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestMediaQueryListListenerV8Internal::methodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestMediaQueryListListenerV8Internal
@@ -114,7 +114,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestMediaQueryListListenerTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -138,18 +138,18 @@
v8::Handle<v8::Object> V8TestMediaQueryListListener::createWrapper(PassRefPtr<TestMediaQueryListListener> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestMediaQueryListListener>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestMediaQueryListListener>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestMediaQueryListListener::derefObject(void* object)
{
- static_cast<TestMediaQueryListListener*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestMediaQueryListListener.h b/Source/bindings/tests/results/V8TestMediaQueryListListener.h
index d6a5002..3d5a279 100644
--- a/Source/bindings/tests/results/V8TestMediaQueryListListener.h
+++ b/Source/bindings/tests/results/V8TestMediaQueryListListener.h
@@ -35,11 +35,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestMediaQueryListListener* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestMediaQueryListListener*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestMediaQueryListListener* impl)
+ {
+ return impl;
+ }
+
+ static inline TestMediaQueryListListener* fromInternalPointer(void* object)
+ {
+ return static_cast<TestMediaQueryListListener*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestMediaQueryListListener*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -57,7 +66,7 @@
inline v8::Handle<v8::Object> wrap(TestMediaQueryListListener* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestMediaQueryListListener>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -71,7 +80,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestMediaQueryListListener>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -82,46 +91,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestMediaQueryListListener>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestMediaQueryListListener* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestMediaQueryListListener* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestMediaQueryListListener>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestMediaQueryListListener* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestMediaQueryListListener* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestMediaQueryListListener>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestMediaQueryListListener > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestMediaQueryListListener > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestMediaQueryListListener > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestMediaQueryListListener > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestMediaQueryListListener > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestNamedConstructor.cpp b/Source/bindings/tests/results/V8TestNamedConstructor.cpp
index 945240b..af21325 100644
--- a/Source/bindings/tests/results/V8TestNamedConstructor.cpp
+++ b/Source/bindings/tests/results/V8TestNamedConstructor.cpp
@@ -23,6 +23,7 @@
#include "RuntimeEnabledFeatures.h"
#include "V8Document.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
@@ -30,7 +31,6 @@
#include "bindings/v8/V8ObjectConstructor.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/UnusedParam.h"
@@ -89,19 +89,17 @@
throwNotEnoughArgumentsError(args.GetIsolate());
return;
}
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str1, args[0]);
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str2, args[1]);
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str3, argumentOrNull(args, 2));
- RefPtr<TestNamedConstructor> impl = TestNamedConstructor::createForJSConstructor(document, str1, str2, str3, ec);
+ RefPtr<TestNamedConstructor> impl = TestNamedConstructor::createForJSConstructor(document, str1, str2, str3, es);
v8::Handle<v8::Object> wrapper = args.Holder();
- if (ec) {
- setDOMException(ec, args.GetIsolate());
+ if (es.throwIfNeeded())
return;
- }
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestNamedConstructorConstructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNamedConstructor>(impl.release(), &V8TestNamedConstructorConstructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -111,7 +109,7 @@
if (!cachedTemplate.IsEmpty())
return v8::Local<v8::FunctionTemplate>::New(isolate, cachedTemplate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope scope(isolate);
v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(V8TestNamedConstructorConstructorCallback);
@@ -146,7 +144,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestNamedConstructorTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -175,18 +173,18 @@
v8::Handle<v8::Object> V8TestNamedConstructor::createWrapper(PassRefPtr<TestNamedConstructor> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestNamedConstructor>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNamedConstructor>(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
return wrapper;
}
void V8TestNamedConstructor::derefObject(void* object)
{
- static_cast<TestNamedConstructor*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestNamedConstructor.h b/Source/bindings/tests/results/V8TestNamedConstructor.h
index 9322f01..1b9ee8e 100644
--- a/Source/bindings/tests/results/V8TestNamedConstructor.h
+++ b/Source/bindings/tests/results/V8TestNamedConstructor.h
@@ -41,12 +41,21 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestNamedConstructor* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestNamedConstructor*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static ActiveDOMObject* toActiveDOMObject(v8::Handle<v8::Object>);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestNamedConstructor* impl)
+ {
+ return impl;
+ }
+
+ static inline TestNamedConstructor* fromInternalPointer(void* object)
+ {
+ return static_cast<TestNamedConstructor*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestNamedConstructor*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -64,7 +73,7 @@
inline v8::Handle<v8::Object> wrap(TestNamedConstructor* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestNamedConstructor>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -78,7 +87,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestNamedConstructor>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -89,46 +98,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestNamedConstructor>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestNamedConstructor* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestNamedConstructor* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestNamedConstructor>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestNamedConstructor* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestNamedConstructor* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestNamedConstructor>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestNamedConstructor > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestNamedConstructor > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestNamedConstructor > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestNamedConstructor > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestNamedConstructor > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestNode.cpp b/Source/bindings/tests/results/V8TestNode.cpp
index 0067a19..3fc0303 100644
--- a/Source/bindings/tests/results/V8TestNode.cpp
+++ b/Source/bindings/tests/results/V8TestNode.cpp
@@ -68,7 +68,7 @@
RefPtr<TestNode> impl = TestNode::create();
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestNode::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNode>(impl.release(), &V8TestNode::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -76,7 +76,7 @@
void V8TestNode::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -114,7 +114,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestNodeTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -143,19 +143,18 @@
v8::Handle<v8::Object> V8TestNode::createWrapper(PassRefPtr<TestNode> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
- ASSERT(static_cast<void*>(static_cast<Node*>(impl.get())) == static_cast<void*>(impl.get()));
+ ASSERT(DOMDataStore::getWrapper<V8TestNode>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNode>(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
return wrapper;
}
void V8TestNode::derefObject(void* object)
{
- static_cast<TestNode*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestNode.h b/Source/bindings/tests/results/V8TestNode.h
index 1cb5a0f..05441b2 100644
--- a/Source/bindings/tests/results/V8TestNode.h
+++ b/Source/bindings/tests/results/V8TestNode.h
@@ -36,13 +36,22 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestNode* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestNode*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static EventTarget* toEventTarget(v8::Handle<v8::Object>);
static void constructorCallback(const v8::FunctionCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestNode* impl)
+ {
+ return V8Node::toInternalPointer(impl);
+ }
+
+ static inline TestNode* fromInternalPointer(void* object)
+ {
+ return static_cast<TestNode*>(V8Node::fromInternalPointer(object));
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestNode*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -60,7 +69,7 @@
inline v8::Handle<v8::Object> wrap(TestNode* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestNode>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -74,7 +83,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestNode>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -85,46 +94,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestNode>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestNode* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestNode* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestNode>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestNode* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestNode* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestNode>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestNode > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestNode > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestNode > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestNode > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestNode > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp
index 5f7a4ca..89c6f74 100644
--- a/Source/bindings/tests/results/V8TestObject.cpp
+++ b/Source/bindings/tests/results/V8TestObject.cpp
@@ -39,6 +39,7 @@
#include "V8TestSubObj.h"
#include "bindings/v8/BindingSecurity.h"
#include "bindings/v8/Dictionary.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/ScriptValue.h"
#include "bindings/v8/SerializedScriptValue.h"
@@ -50,8 +51,9 @@
#include "bindings/v8/V8HiddenPropertyName.h"
#include "bindings/v8/V8ObjectConstructor.h"
#include "core/dom/ContextFeatures.h"
+#include "core/dom/CustomElementCallbackDispatcher.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
+#include "core/page/DOMWindow.h"
#include "core/page/Frame.h"
#include "core/page/PageConsole.h"
#include "core/page/UseCounter.h"
@@ -59,7 +61,6 @@
#include "core/svg/properties/SVGPropertyTearOff.h"
#include "core/svg/properties/SVGStaticPropertyTearOff.h"
#include "wtf/GetPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
#include "wtf/UnusedParam.h"
#include "wtf/Vector.h"
@@ -101,26 +102,30 @@
static void readOnlyLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::readOnlyLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void readOnlyStringAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->readOnlyStringAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->readOnlyStringAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void readOnlyStringAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::readOnlyStringAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void readOnlyTestObjectAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
RefPtr<TestObj> result = imp->readOnlyTestObjectAttr();
- v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper(result.get(), info.GetIsolate())) : v8Undefined();
+ v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper<V8TestObject>(result.get(), info.GetIsolate())) : v8Undefined();
if (wrapper.IsEmpty()) {
wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());
if (!wrapper.IsEmpty())
@@ -132,7 +137,9 @@
static void readOnlyTestObjectAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::readOnlyTestObjectAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void staticReadOnlyLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -143,18 +150,22 @@
static void staticReadOnlyLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::staticReadOnlyLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void staticStringAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- v8SetReturnValue(info, v8String(TestObj::staticStringAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, TestObj::staticStringAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void staticStringAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::staticStringAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void staticStringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -166,21 +177,23 @@
static void staticStringAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::staticStringAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enumAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->enumAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->enumAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void enumAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enumAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enumAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -196,21 +209,23 @@
static void enumAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enumAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void readOnlyEnumAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->readOnlyEnumAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->readOnlyEnumAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void readOnlyEnumAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::readOnlyEnumAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void byteAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -222,7 +237,9 @@
static void byteAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::byteAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void byteAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -235,9 +252,9 @@
static void byteAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::byteAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void octetAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -249,7 +266,9 @@
static void octetAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::octetAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void octetAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -262,9 +281,9 @@
static void octetAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::octetAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void shortAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -276,7 +295,9 @@
static void shortAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::shortAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void shortAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -289,9 +310,9 @@
static void shortAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::shortAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void unsignedShortAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -303,7 +324,9 @@
static void unsignedShortAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::unsignedShortAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void unsignedShortAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -316,9 +339,9 @@
static void unsignedShortAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::unsignedShortAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -330,7 +353,9 @@
static void longAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::longAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -343,9 +368,9 @@
static void longAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::longAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -357,7 +382,9 @@
static void longLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::longLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -370,9 +397,9 @@
static void longLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::longLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void unsignedLongLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -384,7 +411,9 @@
static void unsignedLongLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::unsignedLongLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void unsignedLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -397,21 +426,23 @@
static void unsignedLongLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::unsignedLongLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->stringAttr(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->stringAttr(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void stringAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::stringAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -424,9 +455,9 @@
static void stringAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::stringAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void testObjAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -438,8 +469,10 @@
static void testObjAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
UseCounter::count(activeDOMWindow(), UseCounter::TestFeature);
TestObjV8Internal::testObjAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void testObjAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -452,10 +485,10 @@
static void testObjAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
UseCounter::count(activeDOMWindow(), UseCounter::TestFeature);
TestObjV8Internal::testObjAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void XMLObjAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -467,7 +500,9 @@
static void XMLObjAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::XMLObjAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void XMLObjAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -480,9 +515,9 @@
static void XMLObjAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::XMLObjAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void createAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -494,7 +529,9 @@
static void createAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::createAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void createAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -507,36 +544,40 @@
static void createAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::createAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedStringAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->fastGetAttribute(WebCore::HTMLNames::reflectedstringattrAttr), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->fastGetAttribute(WebCore::HTMLNames::reflectedstringattrAttr), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void reflectedStringAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedStringAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedStringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, v, value);
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, v);
return;
}
static void reflectedStringAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedStringAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedIntegralAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -548,22 +589,26 @@
static void reflectedIntegralAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedIntegralAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(int, v, toInt32(value));
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, v);
return;
}
static void reflectedIntegralAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedIntegralAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedUnsignedIntegralAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -575,22 +620,26 @@
static void reflectedUnsignedIntegralAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedUnsignedIntegralAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedUnsignedIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(unsigned, v, toUInt32(value));
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, v);
return;
}
static void reflectedUnsignedIntegralAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedUnsignedIntegralAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedBooleanAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -602,76 +651,88 @@
static void reflectedBooleanAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedBooleanAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(bool, v, value->BooleanValue());
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, v);
return;
}
static void reflectedBooleanAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedBooleanAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedURLAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void reflectedURLAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedURLAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedURLAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, v, value);
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, v);
return;
}
static void reflectedURLAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedURLAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedStringAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->fastGetAttribute(WebCore::HTMLNames::customContentStringAttrAttr), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->fastGetAttribute(WebCore::HTMLNames::customContentStringAttrAttr), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void reflectedStringAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedStringAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedStringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, v, value);
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, v);
return;
}
static void reflectedStringAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedStringAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomIntegralAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -683,22 +744,26 @@
static void reflectedCustomIntegralAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedCustomIntegralAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(int, v, toInt32(value));
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, v);
return;
}
static void reflectedCustomIntegralAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedCustomIntegralAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomBooleanAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -710,49 +775,57 @@
static void reflectedCustomBooleanAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedCustomBooleanAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(bool, v, value->BooleanValue());
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, v);
return;
}
static void reflectedCustomBooleanAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedCustomBooleanAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomURLAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void reflectedCustomURLAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::reflectedCustomURLAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void reflectedCustomURLAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, v, value);
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
imp->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, v);
return;
}
static void reflectedCustomURLAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
+ CustomElementCallbackDispatcher::CallbackDeliveryScope deliveryScope;
TestObjV8Internal::reflectedCustomURLAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void typedArrayAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -764,7 +837,9 @@
static void typedArrayAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::typedArrayAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void typedArrayAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -777,27 +852,27 @@
static void typedArrayAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::typedArrayAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
- int v = imp->attrWithGetterException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ int v = imp->attrWithGetterException(es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
v8SetReturnValueInt(info, v);
return;
}
static void attrWithGetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::attrWithGetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -810,9 +885,9 @@
static void attrWithGetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::attrWithGetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -824,43 +899,44 @@
static void attrWithSetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::attrWithSetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_VOID(int, v, toInt32(value));
- ExceptionCode ec = 0;
- imp->setAttrWithSetterException(v, ec);
- if (UNLIKELY(ec))
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ imp->setAttrWithSetterException(v, es);
+ es.throwIfNeeded();
return;
}
static void attrWithSetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::attrWithSetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
- String v = imp->stringAttrWithGetterException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ String v = imp->stringAttrWithGetterException(es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
- v8SetReturnValue(info, v8String(v, info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, v, info.GetIsolate(), NullStringAsEmpty);
return;
}
static void stringAttrWithGetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::stringAttrWithGetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -873,51 +949,54 @@
static void stringAttrWithGetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::stringAttrWithGetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->stringAttrWithSetterException(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->stringAttrWithSetterException(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void stringAttrWithSetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::stringAttrWithSetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
- ExceptionCode ec = 0;
- imp->setStringAttrWithSetterException(v, ec);
- if (UNLIKELY(ec))
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ imp->setStringAttrWithSetterException(v, es);
+ es.throwIfNeeded();
return;
}
static void stringAttrWithSetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::stringAttrWithSetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void customAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8TestObject::customAttrAttrGetterCustom(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void customAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8TestObject::customAttrAttrSetterCustom(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -933,7 +1012,9 @@
static void withScriptStateAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptStateAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -952,9 +1033,9 @@
static void withScriptStateAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptStateAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -967,7 +1048,9 @@
static void withScriptExecutionContextAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptExecutionContextAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -981,9 +1064,9 @@
static void withScriptExecutionContextAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptExecutionContextAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withActiveWindowAndFirstWindowAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -995,7 +1078,9 @@
static void withActiveWindowAndFirstWindowAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withActiveWindowAndFirstWindowAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withActiveWindowAndFirstWindowAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1008,24 +1093,22 @@
static void withActiveWindowAndFirstWindowAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withActiveWindowAndFirstWindowAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
ScriptState* currentState = ScriptState::current();
if (!currentState)
return v8Undefined();
ScriptState& state = *currentState;
- RefPtr<TestObj> v = imp->withScriptStateAttributeRaises(&state, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ RefPtr<TestObj> v = imp->withScriptStateAttributeRaises(&state, es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
if (state.hadException()) {
throwError(state.exception(), info.GetIsolate());
return;
@@ -1036,7 +1119,9 @@
static void withScriptStateAttributeRaisesAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptStateAttributeRaisesAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1055,28 +1140,28 @@
static void withScriptStateAttributeRaisesAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptStateAttributeRaisesAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
ScriptExecutionContext* scriptContext = getScriptExecutionContext();
- RefPtr<TestObj> v = imp->withScriptExecutionContextAttributeRaises(scriptContext, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ RefPtr<TestObj> v = imp->withScriptExecutionContextAttributeRaises(scriptContext, es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
v8SetReturnValue(info, toV8Fast(v.release(), info, imp));
return;
}
static void withScriptExecutionContextAttributeRaisesAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptExecutionContextAttributeRaisesAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1090,9 +1175,9 @@
static void withScriptExecutionContextAttributeRaisesAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptExecutionContextAttributeRaisesAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1109,7 +1194,9 @@
static void withScriptExecutionContextAndScriptStateAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1129,25 +1216,23 @@
static void withScriptExecutionContextAndScriptStateAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
ScriptState* currentState = ScriptState::current();
if (!currentState)
return v8Undefined();
ScriptState& state = *currentState;
ScriptExecutionContext* scriptContext = getScriptExecutionContext();
- RefPtr<TestObj> v = imp->withScriptExecutionContextAndScriptStateAttributeRaises(&state, scriptContext, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ RefPtr<TestObj> v = imp->withScriptExecutionContextAndScriptStateAttributeRaises(&state, scriptContext, es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
if (state.hadException()) {
throwError(state.exception(), info.GetIsolate());
return;
@@ -1158,7 +1243,9 @@
static void withScriptExecutionContextAndScriptStateAttributeRaisesAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeRaisesAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1178,9 +1265,9 @@
static void withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1197,7 +1284,9 @@
static void withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1217,9 +1306,9 @@
static void withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeByteAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1231,7 +1320,9 @@
static void enforcedRangeByteAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeByteAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeByteAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1244,9 +1335,9 @@
static void enforcedRangeByteAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeByteAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeOctetAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1258,7 +1349,9 @@
static void enforcedRangeOctetAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeOctetAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeOctetAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1271,9 +1364,9 @@
static void enforcedRangeOctetAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeOctetAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1285,7 +1378,9 @@
static void enforcedRangeLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1298,9 +1393,9 @@
static void enforcedRangeLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeUnsignedLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1312,7 +1407,9 @@
static void enforcedRangeUnsignedLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeUnsignedLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeUnsignedLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1325,9 +1422,9 @@
static void enforcedRangeUnsignedLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeUnsignedLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeLongLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1339,7 +1436,9 @@
static void enforcedRangeLongLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeLongLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1352,9 +1451,9 @@
static void enforcedRangeLongLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeLongLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeUnsignedLongLongAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1366,7 +1465,9 @@
static void enforcedRangeUnsignedLongLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enforcedRangeUnsignedLongLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enforcedRangeUnsignedLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1379,9 +1480,9 @@
static void enforcedRangeUnsignedLongLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enforcedRangeUnsignedLongLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#if ENABLE(Condition1)
@@ -1399,7 +1500,9 @@
static void conditionalAttr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::conditionalAttr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1)
@@ -1420,9 +1523,9 @@
static void conditionalAttr1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::conditionalAttr1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1)
@@ -1442,7 +1545,9 @@
static void conditionalAttr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::conditionalAttr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) && ENABLE(Condition2)
@@ -1463,9 +1568,9 @@
static void conditionalAttr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::conditionalAttr2AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) && ENABLE(Condition2)
@@ -1485,7 +1590,9 @@
static void conditionalAttr3AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::conditionalAttr3AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) || ENABLE(Condition2)
@@ -1506,9 +1613,9 @@
static void conditionalAttr3AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::conditionalAttr3AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) || ENABLE(Condition2)
@@ -1522,7 +1629,9 @@
static void cachedAttribute1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::cachedAttribute1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void cachedAttribute2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1534,7 +1643,9 @@
static void cachedAttribute2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::cachedAttribute2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void anyAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1546,7 +1657,9 @@
static void anyAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::anyAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void anyAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1559,9 +1672,9 @@
static void anyAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::anyAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void callbackFunctionAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1573,7 +1686,9 @@
static void callbackFunctionAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::callbackFunctionAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void callbackFunctionAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1586,9 +1701,9 @@
static void callbackFunctionAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::callbackFunctionAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeAttr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1600,7 +1715,9 @@
static void enabledAtRuntimeAttr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enabledAtRuntimeAttr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1613,9 +1730,9 @@
static void enabledAtRuntimeAttr1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enabledAtRuntimeAttr1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeAttr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1627,7 +1744,9 @@
static void enabledAtRuntimeAttr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enabledAtRuntimeAttr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1640,9 +1759,9 @@
static void enabledAtRuntimeAttr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enabledAtRuntimeAttr2AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextAttr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1654,7 +1773,9 @@
static void enabledPerContextAttr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enabledPerContextAttr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1667,9 +1788,9 @@
static void enabledPerContextAttr1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enabledPerContextAttr1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextAttr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1681,7 +1802,9 @@
static void enabledPerContextAttr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::enabledPerContextAttr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1694,9 +1817,9 @@
static void enabledPerContextAttr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::enabledPerContextAttr2AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void floatArrayAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1708,7 +1831,9 @@
static void floatArrayAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::floatArrayAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void floatArrayAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1721,9 +1846,9 @@
static void floatArrayAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::floatArrayAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void doubleArrayAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1735,7 +1860,9 @@
static void doubleArrayAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::doubleArrayAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void doubleArrayAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1748,9 +1875,9 @@
static void doubleArrayAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::doubleArrayAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void messagePortArrayAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1762,7 +1889,9 @@
static void messagePortArrayAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::messagePortArrayAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void messagePortArrayAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1775,9 +1904,9 @@
static void messagePortArrayAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::messagePortArrayAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void contentDocumentAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1793,61 +1922,67 @@
static void contentDocumentAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::contentDocumentAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void mutablePointAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, toV8Fast(WTF::getPtr(SVGStaticPropertyTearOff<TestObj, FloatPoint>::create(imp, imp->mutablePoint(), &TestObj::updateMutablePoint)), info, imp));
+ v8SetReturnValue(info, toV8Fast(WTF::getPtr(SVGStaticPropertyTearOff<TestObj, SVGPoint>::create(imp, imp->mutablePoint(), &TestObj::updateMutablePoint)), info, imp));
return;
}
static void mutablePointAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::mutablePointAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void mutablePointAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<FloatPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
+ V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<SVGPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
imp->setMutablePoint(WTF::getPtr(v));
return;
}
static void mutablePointAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::mutablePointAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutablePointAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, toV8Fast(WTF::getPtr(SVGPropertyTearOff<FloatPoint>::create(imp->immutablePoint())), info, imp));
+ v8SetReturnValue(info, toV8Fast(WTF::getPtr(SVGPropertyTearOff<SVGPoint>::create(imp->immutablePoint())), info, imp));
return;
}
static void immutablePointAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::immutablePointAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutablePointAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<FloatPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
+ V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<SVGPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
imp->setImmutablePoint(WTF::getPtr(v));
return;
}
static void immutablePointAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::immutablePointAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void strawberryAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1859,7 +1994,9 @@
static void strawberryAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::strawberryAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void strawberryAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1872,9 +2009,9 @@
static void strawberryAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::strawberryAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void strictFloatAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1886,7 +2023,9 @@
static void strictFloatAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::strictFloatAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void strictFloatAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1899,9 +2038,9 @@
static void strictFloatAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::strictFloatAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void descriptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1913,7 +2052,9 @@
static void descriptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::descriptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void idAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1925,7 +2066,9 @@
static void idAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::idAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void idAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -1938,21 +2081,23 @@
static void idAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::idAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void hashAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->hash(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->hash(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void hashAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::hashAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void replaceableAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1964,7 +2109,9 @@
static void replaceableAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::replaceableAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableDoubleAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -1982,7 +2129,9 @@
static void nullableDoubleAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableDoubleAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableLongAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2000,7 +2149,9 @@
static void nullableLongAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableLongAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableBooleanAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2018,7 +2169,9 @@
static void nullableBooleanAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableBooleanAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableStringAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2030,13 +2183,15 @@
v8SetReturnValueNull(info);
return;
}
- v8SetReturnValue(info, v8String(v, info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, v, info.GetIsolate(), NullStringAsEmpty);
return;
}
static void nullableStringAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableStringAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableLongSettableAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2054,7 +2209,9 @@
static void nullableLongSettableAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableLongSettableAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableLongSettableAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2067,32 +2224,32 @@
static void nullableLongSettableAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::nullableLongSettableAttributeAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableStringValueAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
bool isNull = false;
- int v = imp->nullableStringValue(isNull, ec);
+ int v = imp->nullableStringValue(isNull, es);
if (isNull) {
v8SetReturnValueNull(info);
return;
}
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
v8SetReturnValueInt(info, v);
return;
}
static void nullableStringValueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::nullableStringValueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableStringValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2105,16 +2262,16 @@
static void nullableStringValueAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::nullableStringValueAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldReadOnlyAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
RefPtr<TestObj> result = imp->perWorldReadOnlyAttribute();
- v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper(result.get(), info.GetIsolate())) : v8Undefined();
+ v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper<V8TestObject>(result.get(), info.GetIsolate())) : v8Undefined();
if (wrapper.IsEmpty()) {
wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());
if (!wrapper.IsEmpty())
@@ -2126,14 +2283,16 @@
static void perWorldReadOnlyAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::perWorldReadOnlyAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldReadOnlyAttributeAttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestObj* imp = V8TestObject::toNative(info.Holder());
RefPtr<TestObj> result = imp->perWorldReadOnlyAttribute();
- v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapperForMainWorld(result.get())) : v8Undefined();
+ v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapperForMainWorld<V8TestObject>(result.get())) : v8Undefined();
if (wrapper.IsEmpty()) {
wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());
if (!wrapper.IsEmpty())
@@ -2145,7 +2304,9 @@
static void perWorldReadOnlyAttributeAttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::perWorldReadOnlyAttributeAttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldAttributeAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2157,7 +2318,9 @@
static void perWorldAttributeAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::perWorldAttributeAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldAttributeAttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2169,7 +2332,9 @@
static void perWorldAttributeAttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::perWorldAttributeAttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2182,7 +2347,9 @@
static void perWorldAttributeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::perWorldAttributeAttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldAttributeAttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2195,7 +2362,9 @@
static void perWorldAttributeAttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::perWorldAttributeAttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2207,10 +2376,12 @@
static void activityLoggedAttr1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttr1", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttr1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2223,14 +2394,14 @@
static void activityLoggedAttr1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttr1", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttr1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2242,10 +2413,12 @@
static void activityLoggedAttr2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttr2", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttr2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr2AttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2257,10 +2430,12 @@
static void activityLoggedAttr2AttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttr2", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttr2AttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2273,12 +2448,14 @@
static void activityLoggedAttr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttr2", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttr2AttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttr2AttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2291,12 +2468,14 @@
static void activityLoggedAttr2AttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttr2", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttr2AttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2308,10 +2487,12 @@
static void activityLoggedInIsolatedWorldsAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedInIsolatedWorldsAttr", 0, 0, "Getter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrAttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2323,7 +2504,9 @@
static void activityLoggedInIsolatedWorldsAttrAttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrAttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2336,12 +2519,14 @@
static void activityLoggedInIsolatedWorldsAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedInIsolatedWorldsAttr", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrAttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrAttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2354,7 +2539,9 @@
static void activityLoggedInIsolatedWorldsAttrAttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrAttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2366,7 +2553,9 @@
static void activityLoggedAttrSetter1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedAttrSetter1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2379,14 +2568,14 @@
static void activityLoggedAttrSetter1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttrSetter1", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttrSetter1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2398,7 +2587,9 @@
static void activityLoggedAttrSetter2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedAttrSetter2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter2AttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2410,7 +2601,9 @@
static void activityLoggedAttrSetter2AttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedAttrSetter2AttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2423,12 +2616,14 @@
static void activityLoggedAttrSetter2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttrSetter2", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttrSetter2AttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrSetter2AttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2441,12 +2636,14 @@
static void activityLoggedAttrSetter2AttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedAttrSetter2", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedAttrSetter2AttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrSetterAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2458,7 +2655,9 @@
static void activityLoggedInIsolatedWorldsAttrSetterAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrSetterAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrSetterAttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2470,7 +2669,9 @@
static void activityLoggedInIsolatedWorldsAttrSetterAttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrSetterAttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrSetterAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2483,12 +2684,14 @@
static void activityLoggedInIsolatedWorldsAttrSetterAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
v8::Handle<v8::Value> loggerArg[] = { value };
contextData->activityLogger()->log("TestObject.activityLoggedInIsolatedWorldsAttrSetter", 1, &loggerArg[0], "Setter");
}
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrSetterAttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrSetterAttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2501,7 +2704,9 @@
static void activityLoggedInIsolatedWorldsAttrSetterAttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrSetterAttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter1AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2513,10 +2718,12 @@
static void activityLoggedAttrGetter1AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttrGetter1", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttrGetter1AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2529,9 +2736,9 @@
static void activityLoggedAttrGetter1AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedAttrGetter1AttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter2AttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2543,10 +2750,12 @@
static void activityLoggedAttrGetter2AttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttrGetter2", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttrGetter2AttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter2AttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2558,10 +2767,12 @@
static void activityLoggedAttrGetter2AttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedAttrGetter2", 0, 0, "Getter");
TestObjV8Internal::activityLoggedAttrGetter2AttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2574,7 +2785,9 @@
static void activityLoggedAttrGetter2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedAttrGetter2AttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedAttrGetter2AttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2587,7 +2800,9 @@
static void activityLoggedAttrGetter2AttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedAttrGetter2AttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrGetterAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2599,10 +2814,12 @@
static void activityLoggedInIsolatedWorldsAttrGetterAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger())
contextData->activityLogger()->log("TestObject.activityLoggedInIsolatedWorldsAttrGetter", 0, 0, "Getter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrGetterAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrGetterAttrGetterForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2614,7 +2831,9 @@
static void activityLoggedInIsolatedWorldsAttrGetterAttrGetterCallbackForMainWorld(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrGetterAttrGetterForMainWorld(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrGetterAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2627,7 +2846,9 @@
static void activityLoggedInIsolatedWorldsAttrGetterAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrGetterAttrSetter(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldsAttrGetterAttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2640,7 +2861,9 @@
static void activityLoggedInIsolatedWorldsAttrGetterAttrSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestObjV8Internal::activityLoggedInIsolatedWorldsAttrGetterAttrSetterForMainWorld(name, value, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedStaticReadOnlyAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2651,8 +2874,10 @@
static void deprecatedStaticReadOnlyAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::StaticReadonlyAttribute);
TestObjV8Internal::deprecatedStaticReadOnlyAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedStaticAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2663,8 +2888,10 @@
static void deprecatedStaticAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::StaticAttribute);
TestObjV8Internal::deprecatedStaticAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedStaticAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2676,10 +2903,10 @@
static void deprecatedStaticAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::StaticAttribute);
TestObjV8Internal::deprecatedStaticAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedReadonlyAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2691,8 +2918,10 @@
static void deprecatedReadonlyAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::ReadonlyAttribute);
TestObjV8Internal::deprecatedReadonlyAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedAttrAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2704,8 +2933,10 @@
static void deprecatedAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::Attribute);
TestObjV8Internal::deprecatedAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -2718,10 +2949,10 @@
static void deprecatedAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::Attribute);
TestObjV8Internal::deprecatedAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void TestObjConstructorGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -2753,9 +2984,9 @@
static void voidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::voidMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void voidMethodWithArgsMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2775,9 +3006,9 @@
static void voidMethodWithArgsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::voidMethodWithArgsMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2789,9 +3020,9 @@
static void longMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::longMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void longMethodWithArgsMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2810,9 +3041,9 @@
static void longMethodWithArgsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::longMethodWithArgsMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void objMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2824,10 +3055,10 @@
static void objMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
UseCounter::count(activeDOMWindow(), UseCounter::TestFeature);
TestObjV8Internal::objMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void objMethodWithArgsMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2846,9 +3077,9 @@
static void objMethodWithArgsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::objMethodWithArgsMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithSequenceArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2866,9 +3097,9 @@
static void methodWithSequenceArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithSequenceArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodReturningSequenceMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2885,9 +3116,9 @@
static void methodReturningSequenceMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodReturningSequenceMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnumArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2910,9 +3141,9 @@
static void methodWithEnumArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnumArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodThatRequiresAllArgsAndThrowsMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2922,23 +3153,21 @@
return;
}
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, strArg, args[0]);
V8TRYCATCH_VOID(TestObj*, objArg, V8TestObject::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate())) ? V8TestObject::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
- RefPtr<TestObj> result = imp->methodThatRequiresAllArgsAndThrows(strArg, objArg, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<TestObj> result = imp->methodThatRequiresAllArgsAndThrows(strArg, objArg, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, toV8(result.release(), args.Holder(), args.GetIsolate()));
return;
}
static void methodThatRequiresAllArgsAndThrowsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodThatRequiresAllArgsAndThrowsMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void serializedValueMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2959,9 +3188,9 @@
static void serializedValueMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::serializedValueMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void optionsObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -2988,78 +3217,96 @@
static void optionsObjectMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::optionsObjectMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithExceptionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
- imp->methodWithException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ ExceptionState es(args.GetIsolate());
+ imp->methodWithException(es);
+ if (es.throwIfNeeded())
return;
- }
return;
}
static void methodWithExceptionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithExceptionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void customMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
UseCounter::count(activeDOMWindow(), UseCounter::CustomTestFeature);
V8TestObject::customMethodMethodCustom(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void customMethodWithArgsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8TestObject::customMethodWithArgsMethodCustom(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void addEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ EventTarget* impl = V8TestObject::toNative(args.Holder());
+ if (DOMWindow* window = impl->toDOMWindow()) {
+ if (!BindingSecurity::shouldAllowAccessToFrame(window->frame()))
+ return;
+
+ if (!window->document())
+ return;
+ }
+
RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOrCreate);
if (listener) {
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestObject::toNative(args.Holder())->addEventListener(stringResource, listener, args[2]->BooleanValue());
- createHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
+ impl->addEventListener(stringResource, listener, args[2]->BooleanValue());
+ if (!impl->toNode())
+ createHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
}
}
static void addEventListenerMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::addEventListenerMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void removeEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ EventTarget* impl = V8TestObject::toNative(args.Holder());
+ if (DOMWindow* window = impl->toDOMWindow()) {
+ if (!BindingSecurity::shouldAllowAccessToFrame(window->frame()))
+ return;
+
+ if (!window->document())
+ return;
+ }
+
RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOnly);
if (listener) {
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestObject::toNative(args.Holder())->removeEventListener(stringResource, listener.get(), args[2]->BooleanValue());
- removeHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
+ impl->removeEventListener(stringResource, listener.get(), args[2]->BooleanValue());
+ if (!impl->toNode())
+ removeHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
}
}
static void removeEventListenerMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::removeEventListenerMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateVoidMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3082,9 +3329,9 @@
static void withScriptStateVoidMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptStateVoidMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateObjMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3107,24 +3354,22 @@
static void withScriptStateObjMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptStateObjMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateVoidExceptionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
ScriptState* currentState = ScriptState::current();
if (!currentState)
return;
ScriptState& state = *currentState;
- imp->withScriptStateVoidException(&state, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ imp->withScriptStateVoidException(&state, es);
+ if (es.throwIfNeeded())
return;
- }
if (state.hadException()) {
v8::Local<v8::Value> exception = state.exception();
state.clearException();
@@ -3137,24 +3382,22 @@
static void withScriptStateVoidExceptionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptStateVoidExceptionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptStateObjExceptionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
ScriptState* currentState = ScriptState::current();
if (!currentState)
return;
ScriptState& state = *currentState;
- RefPtr<TestObj> result = imp->withScriptStateObjException(&state, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<TestObj> result = imp->withScriptStateObjException(&state, es);
+ if (es.throwIfNeeded())
return;
- }
if (state.hadException()) {
v8::Local<v8::Value> exception = state.exception();
state.clearException();
@@ -3167,9 +3410,9 @@
static void withScriptStateObjExceptionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptStateObjExceptionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3183,9 +3426,9 @@
static void withScriptExecutionContextMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptExecutionContextMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3209,25 +3452,23 @@
static void withScriptExecutionContextAndScriptStateMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptExecutionContextAndScriptStateMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateObjExceptionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
ScriptState* currentState = ScriptState::current();
if (!currentState)
return;
ScriptState& state = *currentState;
ScriptExecutionContext* scriptContext = getScriptExecutionContext();
- RefPtr<TestObj> result = imp->withScriptExecutionContextAndScriptStateObjException(&state, scriptContext, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<TestObj> result = imp->withScriptExecutionContextAndScriptStateObjException(&state, scriptContext, es);
+ if (es.throwIfNeeded())
return;
- }
if (state.hadException()) {
v8::Local<v8::Value> exception = state.exception();
state.clearException();
@@ -3240,9 +3481,9 @@
static void withScriptExecutionContextAndScriptStateObjExceptionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptExecutionContextAndScriptStateObjExceptionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withScriptExecutionContextAndScriptStateWithSpacesMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3266,9 +3507,9 @@
static void withScriptExecutionContextAndScriptStateWithSpacesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withScriptExecutionContextAndScriptStateWithSpacesMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void withActiveWindowAndFirstWindowMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3281,9 +3522,9 @@
static void withActiveWindowAndFirstWindowMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::withActiveWindowAndFirstWindowMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithOptionalArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3302,9 +3543,9 @@
static void methodWithOptionalArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithOptionalArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithNonOptionalArgAndOptionalArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3328,9 +3569,9 @@
static void methodWithNonOptionalArgAndOptionalArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithNonOptionalArgAndOptionalArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithNonOptionalArgAndTwoOptionalArgsMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3360,9 +3601,9 @@
static void methodWithNonOptionalArgAndTwoOptionalArgsMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithNonOptionalArgAndTwoOptionalArgsMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithOptionalStringMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3381,9 +3622,9 @@
static void methodWithOptionalStringMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithOptionalStringMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithOptionalStringIsUndefinedMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3397,9 +3638,9 @@
static void methodWithOptionalStringIsUndefinedMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithOptionalStringIsUndefinedMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithOptionalStringIsNullStringMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3413,9 +3654,9 @@
static void methodWithOptionalStringIsNullStringMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithOptionalStringIsNullStringMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithCallbackArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3437,9 +3678,9 @@
static void methodWithCallbackArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithCallbackArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithNonCallbackArgAndCallbackArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3462,9 +3703,9 @@
static void methodWithNonCallbackArgAndCallbackArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithNonCallbackArgAndCallbackArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithCallbackAndOptionalArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3485,9 +3726,9 @@
static void methodWithCallbackAndOptionalArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithCallbackAndOptionalArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void staticMethodWithCallbackAndOptionalArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3507,9 +3748,9 @@
static void staticMethodWithCallbackAndOptionalArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::staticMethodWithCallbackAndOptionalArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void staticMethodWithCallbackArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3530,9 +3771,9 @@
static void staticMethodWithCallbackArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::staticMethodWithCallbackArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeInt8Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3550,9 +3791,9 @@
static void methodWithEnforceRangeInt8MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeInt8Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeUInt8Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3570,9 +3811,9 @@
static void methodWithEnforceRangeUInt8MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeUInt8Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeInt32Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3590,9 +3831,9 @@
static void methodWithEnforceRangeInt32MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeInt32Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeUInt32Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3610,9 +3851,9 @@
static void methodWithEnforceRangeUInt32MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeUInt32Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeInt64Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3630,9 +3871,9 @@
static void methodWithEnforceRangeInt64MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeInt64Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithEnforceRangeUInt64Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3650,9 +3891,9 @@
static void methodWithEnforceRangeUInt64MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithEnforceRangeUInt64Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#if ENABLE(Condition1)
@@ -3660,7 +3901,7 @@
static void conditionalMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- v8SetReturnValue(args, v8String(imp->conditionalMethod1(), args.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(args, imp->conditionalMethod1(), args.GetIsolate(), NullStringAsEmpty);
return;
}
@@ -3670,9 +3911,9 @@
static void conditionalMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::conditionalMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1)
@@ -3693,9 +3934,9 @@
static void conditionalMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::conditionalMethod2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) && ENABLE(Condition2)
@@ -3716,9 +3957,9 @@
static void conditionalMethod3MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::conditionalMethod3Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1) || ENABLE(Condition2)
@@ -3732,9 +3973,9 @@
static void callbackFunctionReturnValueMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::callbackFunctionReturnValueMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void callbackFunctionArgumentMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3752,9 +3993,9 @@
static void callbackFunctionArgumentMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::callbackFunctionArgumentMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void overloadedMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3966,9 +4207,9 @@
static void overloadedMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::overloadedMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void classMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3980,9 +4221,9 @@
static void classMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::classMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void classMethodWithOptionalMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -3998,16 +4239,16 @@
static void classMethodWithOptionalMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::classMethodWithOptionalMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void classMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8TestObject::classMethod2MethodCustom(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#if ENABLE(Condition1)
@@ -4067,9 +4308,9 @@
static void overloadedMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::overloadedMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
#endif // ENABLE(Condition1)
@@ -4096,9 +4337,9 @@
static void classMethodWithClampMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::classMethodWithClampMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4116,9 +4357,9 @@
static void enabledAtRuntimeMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::enabledAtRuntimeMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledAtRuntimeMethod2Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4136,9 +4377,9 @@
static void enabledAtRuntimeMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::enabledAtRuntimeMethod2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4156,9 +4397,9 @@
static void enabledPerContextMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::enabledPerContextMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void enabledPerContextMethod2Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4176,9 +4417,9 @@
static void enabledPerContextMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::enabledPerContextMethod2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithUnsignedLongSequenceMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4196,9 +4437,9 @@
static void methodWithUnsignedLongSequenceMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::methodWithUnsignedLongSequenceMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringArrayFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4208,22 +4449,20 @@
return;
}
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_VOID(Vector<String>, values, toNativeArray<String>(args[0]));
- Vector<String> result = imp->stringArrayFunction(values, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ Vector<String> result = imp->stringArrayFunction(values, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, v8Array(result, args.GetIsolate()));
return;
}
static void stringArrayFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::stringArrayFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void domStringListFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4233,46 +4472,42 @@
return;
}
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_VOID(RefPtr<DOMStringList>, values, toDOMStringList(args[0], args.GetIsolate()));
- RefPtr<DOMStringList> result = imp->domStringListFunction(values, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<DOMStringList> result = imp->domStringListFunction(values, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, toV8(result.release(), args.Holder(), args.GetIsolate()));
return;
}
static void domStringListFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::domStringListFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void getSVGDocumentMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
- if (!BindingSecurity::shouldAllowAccessToNode(imp->getSVGDocument(ec))) {
+ ExceptionState es(args.GetIsolate());
+ if (!BindingSecurity::shouldAllowAccessToNode(imp->getSVGDocument(es))) {
v8SetReturnValueNull(args);
return;
}
- RefPtr<SVGDocument> result = imp->getSVGDocument(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ RefPtr<SVGDocument> result = imp->getSVGDocument(es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, toV8(result.release(), args.Holder(), args.GetIsolate()));
return;
}
static void getSVGDocumentMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::getSVGDocumentMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void convert1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4290,9 +4525,9 @@
static void convert1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::convert1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void convert2Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4310,9 +4545,9 @@
static void convert2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::convert2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void convert4Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4330,9 +4565,9 @@
static void convert4MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::convert4Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void convert5Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4350,37 +4585,37 @@
static void convert5MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::convert5Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void mutablePointFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<FloatPoint>::create(imp->mutablePointFunction())), args.Holder(), args.GetIsolate()));
+ v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<SVGPoint>::create(imp->mutablePointFunction())), args.Holder(), args.GetIsolate()));
return;
}
static void mutablePointFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::mutablePointFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutablePointFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestObj* imp = V8TestObject::toNative(args.Holder());
- v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<FloatPoint>::create(imp->immutablePointFunction())), args.Holder(), args.GetIsolate()));
+ v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<SVGPoint>::create(imp->immutablePointFunction())), args.Holder(), args.GetIsolate()));
return;
}
static void immutablePointFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::immutablePointFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void orangeMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4393,9 +4628,9 @@
static void orangeMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::orangeMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void strictFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4405,24 +4640,22 @@
return;
}
TestObj* imp = V8TestObject::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str, args[0]);
V8TRYCATCH_VOID(float, a, static_cast<float>(args[1]->NumberValue()));
V8TRYCATCH_VOID(int, b, toInt32(args[2]));
- bool result = imp->strictFunction(str, a, b, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ bool result = imp->strictFunction(str, a, b, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValueBool(args, result);
return;
}
static void strictFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::strictFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void variadicStringMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4441,9 +4674,9 @@
static void variadicStringMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::variadicStringMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void variadicDoubleMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4462,9 +4695,9 @@
static void variadicDoubleMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::variadicDoubleMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void variadicNodeMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4490,9 +4723,9 @@
static void variadicNodeMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::variadicNodeMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4513,12 +4746,16 @@
static void perWorldMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::perWorldMethodMethod(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void perWorldMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::perWorldMethodMethodForMainWorld(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void overloadedPerWorldMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4611,12 +4848,16 @@
static void overloadedPerWorldMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::overloadedPerWorldMethodMethod(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void overloadedPerWorldMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::overloadedPerWorldMethodMethodForMainWorld(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4634,14 +4875,14 @@
static void activityLoggedMethod1MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.activityLoggedMethod1", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::activityLoggedMethod1Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedMethod2Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4672,22 +4913,26 @@
static void activityLoggedMethod2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.activityLoggedMethod2", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::activityLoggedMethod2Method(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedMethod2MethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.activityLoggedMethod2", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::activityLoggedMethod2MethodForMainWorld(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4718,17 +4963,21 @@
static void activityLoggedInIsolatedWorldMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.activityLoggedInIsolatedWorldMethod", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::activityLoggedInIsolatedWorldMethodMethod(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void activityLoggedInIsolatedWorldMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestObjV8Internal::activityLoggedInIsolatedWorldMethodMethodForMainWorld(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void overloadedActivityLoggedMethod1Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4821,22 +5070,26 @@
static void overloadedActivityLoggedMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.overloadedActivityLoggedMethod", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::overloadedActivityLoggedMethodMethod(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void overloadedActivityLoggedMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
V8PerContextData* contextData = V8PerContextData::from(args.GetIsolate()->GetCurrentContext());
if (contextData && contextData->activityLogger()) {
Vector<v8::Handle<v8::Value> > loggerArgs = toVectorOfArguments(args);
contextData->activityLogger()->log("TestObject.overloadedActivityLoggedMethod", args.Length(), loggerArgs.data(), "Method");
}
TestObjV8Internal::overloadedActivityLoggedMethodMethodForMainWorld(args);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4849,10 +5102,10 @@
static void deprecatedMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::Method);
TestObjV8Internal::deprecatedMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void deprecatedStaticMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4864,10 +5117,10 @@
static void deprecatedStaticMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
UseCounter::countDeprecation(activeDOMWindow(), UseCounter::StaticMethod);
TestObjV8Internal::deprecatedStaticMethodMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -4885,7 +5138,7 @@
RefPtr<TestObj> impl = TestObj::create(testCallback);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestObject::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestObject>(impl.release(), &V8TestObject::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -4901,9 +5154,9 @@
static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMIndexedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
TestObjV8Internal::indexedPropertyGetter(index, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -4921,26 +5174,24 @@
String element = collection->namedItem(propertyName);
if (element.isNull())
return;
- v8SetReturnValue(info, v8String(element, info.GetIsolate()));
+ v8SetReturnValueString(info, element, info.GetIsolate(), NullStringAsEmpty);
}
static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestObjV8Internal::namedPropertyGetter(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- ExceptionCode ec = 0;
+ ExceptionState es(info.GetIsolate());
TestObj* collection = V8TestObject::toNative(info.Holder());
Vector<String> names;
- collection->namedPropertyEnumerator(names, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ collection->namedPropertyEnumerator(names, es);
+ if (es.throwIfNeeded())
return;
- }
v8::Handle<v8::Array> v8names = v8::Array::New(names.size());
for (size_t i = 0; i < names.size(); ++i)
v8names->Set(v8::Integer::New(i, info.GetIsolate()), v8String(names[i], info.GetIsolate()));
@@ -4951,12 +5202,10 @@
{
TestObj* collection = V8TestObject::toNative(info.Holder());
AtomicString propertyName = toWebCoreAtomicString(name);
- ExceptionCode ec = 0;
- bool result = collection->namedPropertyQuery(propertyName, ec);
- if (ec) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ bool result = collection->namedPropertyQuery(propertyName, es);
+ if (es.throwIfNeeded())
return;
- }
if (!result)
return;
v8SetReturnValueInt(info, v8::None);
@@ -4964,16 +5213,16 @@
static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestObjV8Internal::namedPropertyEnumerator(info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMNamedProperty");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
TestObjV8Internal::namedPropertyQuery(name, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestObjV8Internal
@@ -5283,7 +5532,7 @@
void V8TestObject::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -5413,7 +5662,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestObjectTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -5467,18 +5716,18 @@
v8::Handle<v8::Object> V8TestObject::createWrapper(PassRefPtr<TestObj> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestObject>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestObject>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestObject::derefObject(void* object)
{
- static_cast<TestObj*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestObject.h b/Source/bindings/tests/results/V8TestObject.h
index 3318c34..08dcd24 100644
--- a/Source/bindings/tests/results/V8TestObject.h
+++ b/Source/bindings/tests/results/V8TestObject.h
@@ -35,7 +35,7 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestObj* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestObj*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
@@ -46,6 +46,15 @@
static void customAttrAttrGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>&);
static void customAttrAttrSetterCustom(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::PropertyCallbackInfo<void>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestObj* impl)
+ {
+ return impl;
+ }
+
+ static inline TestObj* fromInternalPointer(void* object)
+ {
+ return static_cast<TestObj*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestObj*, v8::Isolate*);
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*);
private:
@@ -63,7 +72,7 @@
inline v8::Handle<v8::Object> wrap(TestObj* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestObject>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -77,7 +86,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestObject>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -88,46 +97,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestObject>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestObj* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestObj* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestObject>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestObj* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestObj* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestObject>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestObj > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestObj > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestObj > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestObj > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestObj > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestOverloadedConstructors.cpp b/Source/bindings/tests/results/V8TestOverloadedConstructors.cpp
index 61bee8b..7ef1bec 100644
--- a/Source/bindings/tests/results/V8TestOverloadedConstructors.cpp
+++ b/Source/bindings/tests/results/V8TestOverloadedConstructors.cpp
@@ -22,17 +22,17 @@
#include "V8TestOverloadedConstructors.h"
#include "RuntimeEnabledFeatures.h"
-#include "V8ArrayBuffer.h"
#include "V8ArrayBufferView.h"
#include "V8Blob.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/V8DOMConfiguration.h"
#include "bindings/v8/V8DOMWrapper.h"
#include "bindings/v8/V8ObjectConstructor.h"
+#include "bindings/v8/custom/V8ArrayBufferCustom.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "wtf/UnusedParam.h"
@@ -67,12 +67,12 @@
static void constructor1(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- V8TRYCATCH_VOID(ArrayBuffer*, arrayBuffer, V8ArrayBuffer::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8ArrayBuffer::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
+ V8TRYCATCH_VOID(ArrayBuffer*, arrayBuffer, args[0]->IsArrayBuffer() ? V8ArrayBuffer::toNative(v8::Handle<v8::ArrayBuffer>::Cast(args[0])) : 0);
RefPtr<TestOverloadedConstructors> impl = TestOverloadedConstructors::create(arrayBuffer);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestOverloadedConstructors>(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -83,7 +83,7 @@
RefPtr<TestOverloadedConstructors> impl = TestOverloadedConstructors::create(arrayBufferView);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestOverloadedConstructors>(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -94,7 +94,7 @@
RefPtr<TestOverloadedConstructors> impl = TestOverloadedConstructors::create(blob);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestOverloadedConstructors>(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -105,7 +105,7 @@
RefPtr<TestOverloadedConstructors> impl = TestOverloadedConstructors::create(string);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestOverloadedConstructors>(impl.release(), &V8TestOverloadedConstructors::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -139,7 +139,7 @@
void V8TestOverloadedConstructors::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -177,7 +177,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestOverloadedConstructorsTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -201,18 +201,18 @@
v8::Handle<v8::Object> V8TestOverloadedConstructors::createWrapper(PassRefPtr<TestOverloadedConstructors> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestOverloadedConstructors>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestOverloadedConstructors>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestOverloadedConstructors::derefObject(void* object)
{
- static_cast<TestOverloadedConstructors*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestOverloadedConstructors.h b/Source/bindings/tests/results/V8TestOverloadedConstructors.h
index 8e0e261..07bd508 100644
--- a/Source/bindings/tests/results/V8TestOverloadedConstructors.h
+++ b/Source/bindings/tests/results/V8TestOverloadedConstructors.h
@@ -35,12 +35,21 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestOverloadedConstructors* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestOverloadedConstructors*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static void constructorCallback(const v8::FunctionCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestOverloadedConstructors* impl)
+ {
+ return impl;
+ }
+
+ static inline TestOverloadedConstructors* fromInternalPointer(void* object)
+ {
+ return static_cast<TestOverloadedConstructors*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestOverloadedConstructors*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -58,7 +67,7 @@
inline v8::Handle<v8::Object> wrap(TestOverloadedConstructors* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestOverloadedConstructors>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -72,7 +81,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestOverloadedConstructors>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -83,46 +92,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestOverloadedConstructors>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestOverloadedConstructors* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestOverloadedConstructors* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestOverloadedConstructors>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestOverloadedConstructors* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestOverloadedConstructors* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestOverloadedConstructors>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestOverloadedConstructors > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestOverloadedConstructors > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestOverloadedConstructors > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestOverloadedConstructors > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestOverloadedConstructors > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.cpp b/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.cpp
index c306dd9..acf2e70 100644
--- a/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.cpp
+++ b/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.cpp
@@ -72,7 +72,9 @@
static void valueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestSerializedScriptValueInterfaceV8Internal::valueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void valueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -85,9 +87,9 @@
static void valueAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestSerializedScriptValueInterfaceV8Internal::valueAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void readonlyValueAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -99,7 +101,9 @@
static void readonlyValueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestSerializedScriptValueInterfaceV8Internal::readonlyValueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void cachedValueAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -120,7 +124,9 @@
static void cachedValueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestSerializedScriptValueInterfaceV8Internal::cachedValueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void cachedValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -134,9 +140,9 @@
static void cachedValueAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestSerializedScriptValueInterfaceV8Internal::cachedValueAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void cachedReadonlyValueAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -157,7 +163,9 @@
static void cachedReadonlyValueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestSerializedScriptValueInterfaceV8Internal::cachedReadonlyValueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
} // namespace TestSerializedScriptValueInterfaceV8Internal
@@ -195,7 +203,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestSerializedScriptValueInterfaceTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -219,18 +227,18 @@
v8::Handle<v8::Object> V8TestSerializedScriptValueInterface::createWrapper(PassRefPtr<TestSerializedScriptValueInterface> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestSerializedScriptValueInterface>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestSerializedScriptValueInterface>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestSerializedScriptValueInterface::derefObject(void* object)
{
- static_cast<TestSerializedScriptValueInterface*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.h b/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.h
index fabbad3..d2a6b78 100644
--- a/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.h
+++ b/Source/bindings/tests/results/V8TestSerializedScriptValueInterface.h
@@ -36,11 +36,20 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestSerializedScriptValueInterface* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestSerializedScriptValueInterface*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestSerializedScriptValueInterface* impl)
+ {
+ return impl;
+ }
+
+ static inline TestSerializedScriptValueInterface* fromInternalPointer(void* object)
+ {
+ return static_cast<TestSerializedScriptValueInterface*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestSerializedScriptValueInterface*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -58,7 +67,7 @@
inline v8::Handle<v8::Object> wrap(TestSerializedScriptValueInterface* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestSerializedScriptValueInterface>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -72,7 +81,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestSerializedScriptValueInterface>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -83,46 +92,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestSerializedScriptValueInterface>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestSerializedScriptValueInterface* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestSerializedScriptValueInterface* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestSerializedScriptValueInterface>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestSerializedScriptValueInterface* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestSerializedScriptValueInterface* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestSerializedScriptValueInterface>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestSerializedScriptValueInterface > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestSerializedScriptValueInterface > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestSerializedScriptValueInterface > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestSerializedScriptValueInterface > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestSerializedScriptValueInterface > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
diff --git a/Source/bindings/tests/results/V8TestTypedefs.cpp b/Source/bindings/tests/results/V8TestTypedefs.cpp
index 74bb4c2..c66f90b 100644
--- a/Source/bindings/tests/results/V8TestTypedefs.cpp
+++ b/Source/bindings/tests/results/V8TestTypedefs.cpp
@@ -27,6 +27,7 @@
#include "V8SerializedScriptValue.h"
#include "V8TestCallback.h"
#include "V8TestSubObj.h"
+#include "bindings/v8/ExceptionState.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/SerializedScriptValue.h"
#include "bindings/v8/V8Binding.h"
@@ -35,7 +36,6 @@
#include "bindings/v8/V8ObjectConstructor.h"
#include "core/dom/ContextFeatures.h"
#include "core/dom/Document.h"
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/platform/chromium/TraceEvent.h"
#include "core/svg/properties/SVGPropertyTearOff.h"
@@ -78,7 +78,9 @@
static void unsignedLongLongAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::unsignedLongLongAttrAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void unsignedLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -91,9 +93,9 @@
static void unsignedLongLongAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::unsignedLongLongAttrAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutableSerializedScriptValueAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -105,7 +107,9 @@
static void immutableSerializedScriptValueAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::immutableSerializedScriptValueAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutableSerializedScriptValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -118,27 +122,27 @@
static void immutableSerializedScriptValueAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::immutableSerializedScriptValueAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
- ExceptionCode ec = 0;
- int v = imp->attrWithGetterException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ int v = imp->attrWithGetterException(es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
v8SetReturnValueInt(info, v);
return;
}
static void attrWithGetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::attrWithGetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -151,9 +155,9 @@
static void attrWithGetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::attrWithGetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -165,43 +169,44 @@
static void attrWithSetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::attrWithSetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void attrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
V8TRYCATCH_VOID(int, v, toInt32(value));
- ExceptionCode ec = 0;
- imp->setAttrWithSetterException(v, ec);
- if (UNLIKELY(ec))
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ imp->setAttrWithSetterException(v, es);
+ es.throwIfNeeded();
return;
}
static void attrWithSetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::attrWithSetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
- ExceptionCode ec = 0;
- String v = imp->stringAttrWithGetterException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ String v = imp->stringAttrWithGetterException(es);
+ if (UNLIKELY(es.throwIfNeeded()))
return;
- };
- v8SetReturnValue(info, v8String(v, info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, v, info.GetIsolate(), NullStringAsEmpty);
return;
}
static void stringAttrWithGetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::stringAttrWithGetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
@@ -214,39 +219,40 @@
static void stringAttrWithGetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::stringAttrWithGetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
- v8SetReturnValue(info, v8String(imp->stringAttrWithSetterException(), info.GetIsolate(), ReturnUnsafeHandle));
+ v8SetReturnValueString(info, imp->stringAttrWithSetterException(), info.GetIsolate(), NullStringAsEmpty);
return;
}
static void stringAttrWithSetterExceptionAttrGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter");
TestTypedefsV8Internal::stringAttrWithSetterExceptionAttrGetter(name, info);
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringAttrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
- ExceptionCode ec = 0;
- imp->setStringAttrWithSetterException(v, ec);
- if (UNLIKELY(ec))
- setDOMException(ec, info.GetIsolate());
+ ExceptionState es(info.GetIsolate());
+ imp->setStringAttrWithSetterException(v, es);
+ es.throwIfNeeded();
return;
}
static void stringAttrWithSetterExceptionAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
TestTypedefsV8Internal::stringAttrWithSetterExceptionAttrSetter(name, value, info);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void TestTypedefsConstructorGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -284,9 +290,9 @@
static void funcMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::funcMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void setShadowMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -318,9 +324,9 @@
static void setShadowMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::setShadowMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithSequenceArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -337,9 +343,9 @@
static void methodWithSequenceArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::methodWithSequenceArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void nullableArrayArgMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -357,9 +363,9 @@
static void nullableArrayArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::nullableArrayArgMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void funcWithClampMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -389,23 +395,23 @@
static void funcWithClampMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::funcWithClampMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void immutablePointFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestTypedefs* imp = V8TestTypedefs::toNative(args.Holder());
- v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<FloatPoint>::create(imp->immutablePointFunction())), args.Holder(), args.GetIsolate()));
+ v8SetReturnValue(args, toV8(WTF::getPtr(SVGPropertyTearOff<SVGPoint>::create(imp->immutablePointFunction())), args.Holder(), args.GetIsolate()));
return;
}
static void immutablePointFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::immutablePointFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringArrayFunctionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -415,22 +421,20 @@
return;
}
TestTypedefs* imp = V8TestTypedefs::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_VOID(Vector<String>, values, toNativeArray<String>(args[0]));
- Vector<String> result = imp->stringArrayFunction(values, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ Vector<String> result = imp->stringArrayFunction(values, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, v8Array(result, args.GetIsolate()));
return;
}
static void stringArrayFunctionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::stringArrayFunctionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void stringArrayFunction2Method(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -440,42 +444,38 @@
return;
}
TestTypedefs* imp = V8TestTypedefs::toNative(args.Holder());
- ExceptionCode ec = 0;
+ ExceptionState es(args.GetIsolate());
V8TRYCATCH_VOID(Vector<String>, values, toNativeArray<String>(args[0]));
- Vector<String> result = imp->stringArrayFunction2(values, ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ Vector<String> result = imp->stringArrayFunction2(values, es);
+ if (es.throwIfNeeded())
return;
- }
v8SetReturnValue(args, v8Array(result, args.GetIsolate()));
return;
}
static void stringArrayFunction2MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::stringArrayFunction2Method(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void methodWithExceptionMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
TestTypedefs* imp = V8TestTypedefs::toNative(args.Holder());
- ExceptionCode ec = 0;
- imp->methodWithException(ec);
- if (UNLIKELY(ec)) {
- setDOMException(ec, args.GetIsolate());
+ ExceptionState es(args.GetIsolate());
+ imp->methodWithException(es);
+ if (es.throwIfNeeded())
return;
- }
return;
}
static void methodWithExceptionMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TRACE_EVENT_SAMPLING_STATE0("Blink\0Blink-DOMMethod");
+ TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
TestTypedefsV8Internal::methodWithExceptionMethod(args);
- TRACE_EVENT_SAMPLING_STATE0("V8\0V8-Execution");
+ TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
}
static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -494,7 +494,7 @@
RefPtr<TestTypedefs> impl = TestTypedefs::create(hello, testCallback);
v8::Handle<v8::Object> wrapper = args.Holder();
- V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestTypedefs::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestTypedefs>(impl.release(), &V8TestTypedefs::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
args.GetReturnValue().Set(wrapper);
}
@@ -531,7 +531,7 @@
void V8TestTypedefs::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
{
- TraceEvent::SamplingState0Scope("Blink\0Blink-DOMConstructor");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
if (!args.IsConstructCall()) {
throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
return;
@@ -573,7 +573,7 @@
if (result != data->templateMap(currentWorldType).end())
return result->value.newLocal(isolate);
- TraceEvent::SamplingState0Scope("Blink\0Blink-BuildDOMTemplate");
+ TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
v8::HandleScope handleScope(isolate);
v8::Handle<v8::FunctionTemplate> templ =
ConfigureV8TestTypedefsTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
@@ -597,18 +597,18 @@
v8::Handle<v8::Object> V8TestTypedefs::createWrapper(PassRefPtr<TestTypedefs> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl.get());
- ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestTypedefs>(impl.get(), isolate).IsEmpty());
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
+ v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate);
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get(), isolate);
- V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
+ V8DOMWrapper::associateObjectWithWrapper<V8TestTypedefs>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent);
return wrapper;
}
void V8TestTypedefs::derefObject(void* object)
{
- static_cast<TestTypedefs*>(object)->deref();
+ fromInternalPointer(object)->deref();
}
} // namespace WebCore
diff --git a/Source/bindings/tests/results/V8TestTypedefs.h b/Source/bindings/tests/results/V8TestTypedefs.h
index fa32bbe..bd2075a 100644
--- a/Source/bindings/tests/results/V8TestTypedefs.h
+++ b/Source/bindings/tests/results/V8TestTypedefs.h
@@ -35,12 +35,21 @@
static v8::Handle<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
static TestTypedefs* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestTypedefs*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
}
static void derefObject(void*);
static WrapperTypeInfo info;
static void constructorCallback(const v8::FunctionCallbackInfo<v8::Value>&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
+ static inline void* toInternalPointer(TestTypedefs* impl)
+ {
+ return impl;
+ }
+
+ static inline TestTypedefs* fromInternalPointer(void* object)
+ {
+ return static_cast<TestTypedefs*>(object);
+ }
static void installPerContextProperties(v8::Handle<v8::Object>, TestTypedefs*, v8::Isolate*) { }
static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
private:
@@ -58,7 +67,7 @@
inline v8::Handle<v8::Object> wrap(TestTypedefs* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
ASSERT(impl);
- ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+ ASSERT(DOMDataStore::getWrapper<V8TestTypedefs>(impl, isolate).IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(impl)) {
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl);
// Might be a XXXConstructor::info instead of an XXX::info. These will both have
@@ -72,7 +81,7 @@
{
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper<V8TestTypedefs>(impl, isolate);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
@@ -83,46 +92,46 @@
ASSERT(worldType(isolate) == MainWorld);
if (UNLIKELY(!impl))
return v8NullWithCheck(isolate);
- v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestTypedefs>(impl);
if (!wrapper.IsEmpty())
return wrapper;
return wrap(impl, creationContext, isolate);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(TestTypedefs* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(TestTypedefs* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast(impl, container, wrappable);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperFast<V8TestTypedefs>(impl, callbackInfo, wrappable);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(TestTypedefs* impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(TestTypedefs* impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- ASSERT(worldType(container.GetIsolate()) == MainWorld);
+ ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
if (UNLIKELY(!impl))
- return v8::Null(container.GetIsolate());
- v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld(impl);
+ return v8::Null(callbackInfo.GetIsolate());
+ v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperForMainWorld<V8TestTypedefs>(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return wrap(impl, container.Holder(), container.GetIsolate());
+ return wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestTypedefs > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< TestTypedefs > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8FastForMainWorld(impl.get(), container, wrappable);
+ return toV8FastForMainWorld(impl.get(), callbackInfo, wrappable);
}
-template<class HolderContainer, class Wrappable>
-inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestTypedefs > impl, const HolderContainer& container, Wrappable* wrappable)
+template<class CallbackInfo, class Wrappable>
+inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< TestTypedefs > impl, const CallbackInfo& callbackInfo, Wrappable* wrappable)
{
- return toV8Fast(impl.get(), container, wrappable);
+ return toV8Fast(impl.get(), callbackInfo, wrappable);
}
inline v8::Handle<v8::Value> toV8(PassRefPtr< TestTypedefs > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)