Reviewers: Hannes Payer,
Message:
Committed patchset #1 manually as r17372.
Description:
Fix shared library build after r17368.
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=17372
Please review this at https://codereview.chromium.org/40033002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+8, -3 lines):
M src/d8.h
M src/d8.cc
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
4b1d33be2118ee096d8932c9268459f9f398af76..357c8a48992bdb157de3df6133ae8abd847f6bc5
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -160,13 +160,13 @@ i::OS::MemoryMappedFile* Shell::counters_file_ = NULL;
CounterCollection Shell::local_counters_;
CounterCollection* Shell::counters_ = &local_counters_;
i::Mutex Shell::context_mutex_;
+const i::TimeTicks Shell::kInitialTicks =
i::TimeTicks::HighResolutionNow();
Persistent<Context> Shell::utility_context_;
#endif // V8_SHARED
Persistent<Context> Shell::evaluation_context_;
ShellOptions Shell::options;
const char* Shell::kPrompt = "d8> ";
-const i::TimeTicks Shell::kInitialTicks =
i::TimeTicks::HighResolutionNow();
const int MB = 1024 * 1024;
@@ -290,11 +290,13 @@ int PerIsolateData::RealmFind(Handle<Context>
context) {
}
+#ifndef V8_SHARED
// performance.now() returns a time stamp as double, measured in
milliseconds.
void Shell::PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>&
args) {
i::TimeDelta delta = i::TimeTicks::HighResolutionNow() - kInitialTicks;
args.GetReturnValue().Set(delta.InMillisecondsF());
}
+#endif // V8_SHARED
// Realm.current() returns the index of the currently active realm.
@@ -880,10 +882,12 @@ Handle<ObjectTemplate>
Shell::CreateGlobalTemplate(Isolate* isolate) {
RealmSharedGet, RealmSharedSet);
global_template->Set(String::New("Realm"), realm_template);
+#ifndef V8_SHARED
Handle<ObjectTemplate> performance_template = ObjectTemplate::New();
performance_template->Set(String::New("now"),
FunctionTemplate::New(PerformanceNow));
global_template->Set(String::New("performance"), performance_template);
+#endif // V8_SHARED
#if !defined(V8_SHARED) && !defined(_WIN32) && !defined(_WIN64)
Handle<ObjectTemplate> os_templ = ObjectTemplate::New();
Index: src/d8.h
diff --git a/src/d8.h b/src/d8.h
index
a3716ee772f819fa823960f566319b87fb557f39..411dfdda3e12488a775a35a29b3548a93a838efd
100644
--- a/src/d8.h
+++ b/src/d8.h
@@ -302,9 +302,10 @@ class Shell : public i::AllStatic {
Handle<String> command);
static void DispatchDebugMessages();
#endif // ENABLE_DEBUGGER_SUPPORT
-#endif // V8_SHARED
static void PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>&
args);
+#endif // V8_SHARED
+
static void RealmCurrent(const v8::FunctionCallbackInfo<v8::Value>&
args);
static void RealmOwner(const v8::FunctionCallbackInfo<v8::Value>& args);
static void RealmGlobal(const v8::FunctionCallbackInfo<v8::Value>& args);
@@ -382,7 +383,6 @@ class Shell : public i::AllStatic {
static const char* kPrompt;
static ShellOptions options;
- static const i::TimeTicks kInitialTicks;
private:
static Persistent<Context> evaluation_context_;
@@ -395,6 +395,7 @@ class Shell : public i::AllStatic {
static CounterCollection* counters_;
static i::OS::MemoryMappedFile* counters_file_;
static i::Mutex context_mutex_;
+ static const i::TimeTicks kInitialTicks;
static Counter* GetCounter(const char* name, bool is_histogram);
static void InstallUtilityScript(Isolate* isolate);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
