Reviewers: rossberg,
Message:
PTAL.
Description:
Fix isolate build.
BUG=
TEST=
Please review this at http://codereview.chromium.org/10704038/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/d8.h
M src/d8.cc
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
b3afcfe4e0fd4251d13142afcf530ecb0892d193..976510c464009a19f91bc9e7a0101decdc536fe4
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -117,7 +117,6 @@ Persistent<Context> Shell::utility_context_;
LineEditor* Shell::console = NULL;
Persistent<Context> Shell::evaluation_context_;
-Persistent<FunctionTemplate> Shell::array_buffer_template_;
ShellOptions Shell::options;
const char* Shell::kPrompt = "d8> ";
@@ -489,7 +488,8 @@ Handle<Value> Shell::CreateExternalArray(const
Arguments& args,
byteLength = length * element_size;
byteOffset = 0;
- Handle<Value> array_buffer = array_buffer_template_->GetFunction();
+ Handle<Object> global = Context::GetCurrent()->Global();
+ Handle<Value> array_buffer = global->Get(String::New("ArrayBuffer"));
ASSERT(!try_catch.HasCaught() && array_buffer->IsFunction());
Handle<Value> buffer_args[] = { Uint32::New(byteLength) };
Handle<Value> result =
Handle<Function>::Cast(array_buffer)->NewInstance(
@@ -947,10 +947,8 @@ Handle<ObjectTemplate> Shell::CreateGlobalTemplate() {
// Bind the handlers for external arrays.
PropertyAttribute attr =
static_cast<PropertyAttribute>(ReadOnly | DontDelete);
- array_buffer_template_ =
- Persistent<FunctionTemplate>::New(CreateArrayTemplate(ArrayBuffer));
global_template->Set(String::New("ArrayBuffer"),
- array_buffer_template_, attr);
+ CreateArrayTemplate(ArrayBuffer), attr);
global_template->Set(String::New("Int8Array"),
CreateArrayTemplate(Int8Array), attr);
global_template->Set(String::New("Uint8Array"),
Index: src/d8.h
diff --git a/src/d8.h b/src/d8.h
index
c50797206c043327cc7aba316dd7129a32c66244..3410f1656e7ff89bd374b64db4e81db2635e0165
100644
--- a/src/d8.h
+++ b/src/d8.h
@@ -367,7 +367,6 @@ class Shell : public i::AllStatic {
private:
static Persistent<Context> evaluation_context_;
- static Persistent<FunctionTemplate> array_buffer_template_;
#ifndef V8_SHARED
static Persistent<Context> utility_context_;
static CounterMap* counter_map_;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
