Roll V8 back to 3.6
Roll back to V8 3.6 to fix x86 build, we don't have ucontext.h.
This reverts commits:
5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b
c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9
592a9fc1d8ea420377a2e7efd0600e20b058be2b
Bug: 5688872
Change-Id: Ic961bb5e65b778e98bbfb71cce71d99fa949e995
diff --git a/src/d8.h b/src/d8.h
index c872f90..15d8d5d 100644
--- a/src/d8.h
+++ b/src/d8.h
@@ -1,4 +1,4 @@
-// Copyright 2012 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -116,13 +116,14 @@
#endif // V8_SHARED
+#ifndef V8_SHARED
class LineEditor {
public:
enum Type { DUMB = 0, READLINE = 1 };
LineEditor(Type type, const char* name);
virtual ~LineEditor() { }
- virtual Handle<String> Prompt(const char* prompt) = 0;
+ virtual i::SmartArrayPointer<char> Prompt(const char* prompt) = 0;
virtual bool Open() { return true; }
virtual bool Close() { return true; }
virtual void AddHistory(const char* str) { }
@@ -135,6 +136,7 @@
LineEditor* next_;
static LineEditor* first_;
};
+#endif // V8_SHARED
class SourceGroup {
@@ -195,27 +197,6 @@
};
-class BinaryResource : public v8::String::ExternalAsciiStringResource {
- public:
- BinaryResource(const char* string, int length)
- : data_(string),
- length_(length) { }
-
- ~BinaryResource() {
- delete[] data_;
- data_ = NULL;
- length_ = 0;
- }
-
- virtual const char* data() const { return data_; }
- virtual size_t length() const { return length_; }
-
- private:
- const char* data_;
- size_t length_;
-};
-
-
class ShellOptions {
public:
ShellOptions() :
@@ -287,13 +268,12 @@
size_t buckets);
static void AddHistogramSample(void* histogram, int sample);
static void MapCounters(const char* name);
+#endif // V8_SHARED
#ifdef ENABLE_DEBUGGER_SUPPORT
static Handle<Object> DebugMessageDetails(Handle<String> message);
static Handle<Value> DebugCommandToJSONRequest(Handle<String> command);
- static void DispatchDebugMessages();
-#endif // ENABLE_DEBUGGER_SUPPORT
-#endif // V8_SHARED
+#endif
#ifdef WIN32
#undef Yield
@@ -307,13 +287,8 @@
static Handle<Value> EnableProfiler(const Arguments& args);
static Handle<Value> DisableProfiler(const Arguments& args);
static Handle<Value> Read(const Arguments& args);
- static Handle<Value> ReadBinary(const Arguments& args);
- static Handle<String> ReadFromStdin();
- static Handle<Value> ReadLine(const Arguments& args) {
- return ReadFromStdin();
- }
+ static Handle<Value> ReadLine(const Arguments& args);
static Handle<Value> Load(const Arguments& args);
- static Handle<Value> ArrayBuffer(const Arguments& args);
static Handle<Value> Int8Array(const Arguments& args);
static Handle<Value> Uint8Array(const Arguments& args);
static Handle<Value> Int16Array(const Arguments& args);
@@ -359,8 +334,11 @@
static Handle<Value> RemoveDirectory(const Arguments& args);
static void AddOSMethods(Handle<ObjectTemplate> os_template);
-
+#ifndef V8_SHARED
+ static const char* kHistoryFileName;
+ static const int kMaxHistoryEntries;
static LineEditor* console;
+#endif // V8_SHARED
static const char* kPrompt;
static ShellOptions options;