diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
| commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
| tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/bootstrapper.h | |
| parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
| parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
| download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/bootstrapper.h')
| -rw-r--r-- | src/3rdparty/v8/src/bootstrapper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/v8/src/bootstrapper.h b/src/3rdparty/v8/src/bootstrapper.h index 101c2e1..179e65c 100644 --- a/src/3rdparty/v8/src/bootstrapper.h +++ b/src/3rdparty/v8/src/bootstrapper.h @@ -104,7 +104,7 @@ class Bootstrapper { void DetachGlobal(Handle<Context> env); // Reattach an outer global object to an environment. - void ReattachGlobal(Handle<Context> env, Handle<Object> global_object); + void ReattachGlobal(Handle<Context> env, Handle<JSGlobalProxy> global_proxy); // Traverses the pointers for memory management. void Iterate(ObjectVisitor* v); @@ -126,7 +126,7 @@ class Bootstrapper { char* AllocateAutoDeletedArray(int bytes); // Used for new context creation. - bool InstallExtensions(Handle<Context> global_context, + bool InstallExtensions(Handle<Context> native_context, v8::ExtensionConfiguration* extensions); SourceCodeCache* extensions_cache() { return &extensions_cache_; } |