Index: third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
index 5792406609ce14170555a1d97c442b657495988b..04f72d7f1b343797e4d652640a24e8a71ffb7490 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h |
@@ -53,8 +53,8 @@ static const int v8PrototypeTypeIndex = 0; |
static const int v8PrototypeInternalFieldcount = 1; |
typedef v8::Local<v8::FunctionTemplate> (*DomTemplateFunction)(v8::Isolate*, const DOMWrapperWorld&); |
-typedef HeapObjectHeader* (*GetHeapObjectHeaderFunction)(ScriptWrappable*); |
typedef void (*TraceFunction)(Visitor*, ScriptWrappable*); |
+typedef void (*TraceWrappersFunction)(WrapperVisitor*, ScriptWrappable*); |
typedef ActiveScriptWrappable* (*ToActiveScriptWrappableFunction)(v8::Local<v8::Object>); |
typedef void (*ResolveWrapperReachabilityFunction)(v8::Isolate*, ScriptWrappable*, const v8::Persistent<v8::Object>&); |
typedef void (*PreparePrototypeAndInterfaceObjectFunction)(v8::Local<v8::Context>, const DOMWrapperWorld&, v8::Local<v8::Object>, v8::Local<v8::Function>, v8::Local<v8::FunctionTemplate>); |
@@ -134,18 +134,18 @@ struct WrapperTypeInfo { |
heapStats.increaseCollectedWrapperCount(1); |
} |
- HeapObjectHeader* getHeapObjectHeader(ScriptWrappable* scriptWrappable) const |
- { |
- DCHECK(getHeapObjectHeaderFunction); |
- return getHeapObjectHeaderFunction(scriptWrappable); |
- } |
- |
void trace(Visitor* visitor, ScriptWrappable* scriptWrappable) const |
{ |
DCHECK(traceFunction); |
return traceFunction(visitor, scriptWrappable); |
} |
+ void traceWrappers(WrapperVisitor* visitor, ScriptWrappable* scriptWrappable) const |
+ { |
+ DCHECK(traceWrappersFunction); |
+ return traceWrappersFunction(visitor, scriptWrappable); |
+ } |
+ |
void preparePrototypeAndInterfaceObject(v8::Local<v8::Context> context, const DOMWrapperWorld& world, v8::Local<v8::Object> prototypeObject, v8::Local<v8::Function> interfaceObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) const |
{ |
if (preparePrototypeAndInterfaceObjectFunction) |
@@ -184,8 +184,8 @@ struct WrapperTypeInfo { |
const gin::GinEmbedder ginEmbedder; |
DomTemplateFunction domTemplateFunction; |
- const GetHeapObjectHeaderFunction getHeapObjectHeaderFunction; |
const TraceFunction traceFunction; |
+ const TraceWrappersFunction traceWrappersFunction; |
const ToActiveScriptWrappableFunction toActiveScriptWrappableFunction; |
const ResolveWrapperReachabilityFunction visitDOMWrapperFunction; |
PreparePrototypeAndInterfaceObjectFunction preparePrototypeAndInterfaceObjectFunction; |