Index: src/d8.cc |
diff --git a/src/d8.cc b/src/d8.cc |
index c8a80390bb6957a7417d7e0c1d2dc63cdac694fe..8bdf26f4c27bbb4bd063196b0be3ad76d6552d6f 100644 |
--- a/src/d8.cc |
+++ b/src/d8.cc |
@@ -37,12 +37,12 @@ |
#ifndef V8_SHARED |
#include "src/api.h" |
-#include "src/checks.h" |
-#include "src/cpu.h" |
+#include "src/base/cpu.h" |
+#include "src/base/logging.h" |
+#include "src/base/platform/platform.h" |
#include "src/d8-debug.h" |
#include "src/debug.h" |
#include "src/natives.h" |
-#include "src/platform.h" |
#include "src/v8.h" |
#endif // !V8_SHARED |
@@ -134,11 +134,12 @@ Handle<String> DumbLineEditor::Prompt(const char* prompt) { |
#ifndef V8_SHARED |
CounterMap* Shell::counter_map_; |
-i::OS::MemoryMappedFile* Shell::counters_file_ = NULL; |
+base::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(); |
+base::Mutex Shell::context_mutex_; |
+const base::TimeTicks Shell::kInitialTicks = |
+ base::TimeTicks::HighResolutionNow(); |
Persistent<Context> Shell::utility_context_; |
#endif // !V8_SHARED |
@@ -299,7 +300,8 @@ void Shell::PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>& args) { |
args.GetReturnValue().Set(heap->synthetic_time()); |
} else { |
- i::TimeDelta delta = i::TimeTicks::HighResolutionNow() - kInitialTicks; |
+ base::TimeDelta delta = |
+ base::TimeTicks::HighResolutionNow() - kInitialTicks; |
args.GetReturnValue().Set(delta.InMillisecondsF()); |
} |
} |
@@ -675,7 +677,7 @@ Counter* CounterCollection::GetNextCounter() { |
void Shell::MapCounters(const char* name) { |
- counters_file_ = i::OS::MemoryMappedFile::create( |
+ counters_file_ = base::OS::MemoryMappedFile::create( |
name, sizeof(CounterCollection), &local_counters_); |
void* memory = (counters_file_ == NULL) ? |
NULL : counters_file_->memory(); |
@@ -918,7 +920,7 @@ void Shell::InitializeDebugger(Isolate* isolate) { |
Local<Context> Shell::CreateEvaluationContext(Isolate* isolate) { |
#ifndef V8_SHARED |
// This needs to be a critical section since this is not thread-safe |
- i::LockGuard<i::Mutex> lock_guard(&context_mutex_); |
+ base::LockGuard<base::Mutex> lock_guard(&context_mutex_); |
#endif // !V8_SHARED |
// Initialize the global objects |
Handle<ObjectTemplate> global_template = CreateGlobalTemplate(isolate); |
@@ -1188,12 +1190,12 @@ Handle<String> SourceGroup::ReadFile(Isolate* isolate, const char* name) { |
#ifndef V8_SHARED |
-i::Thread::Options SourceGroup::GetThreadOptions() { |
+base::Thread::Options SourceGroup::GetThreadOptions() { |
// On some systems (OSX 10.6) the stack size default is 0.5Mb or less |
// which is not enough to parse the big literal expressions used in tests. |
// The stack size should be at least StackGuard::kLimitSize + some |
// OS-specific padding for thread startup code. 2Mbytes seems to be enough. |
- return i::Thread::Options("IsolateThread", 2 * MB); |
+ return base::Thread::Options("IsolateThread", 2 * MB); |
} |
@@ -1563,9 +1565,9 @@ int Shell::Main(int argc, char* argv[]) { |
Isolate* isolate = Isolate::New(); |
#ifndef V8_SHARED |
v8::ResourceConstraints constraints; |
- constraints.ConfigureDefaults(i::OS::TotalPhysicalMemory(), |
- i::OS::MaxVirtualMemory(), |
- i::OS::NumberOfProcessorsOnline()); |
+ constraints.ConfigureDefaults(base::OS::TotalPhysicalMemory(), |
+ base::OS::MaxVirtualMemory(), |
+ base::OS::NumberOfProcessorsOnline()); |
v8::SetResourceConstraints(isolate, &constraints); |
#endif |
DumbLineEditor dumb_line_editor(isolate); |