Reviewers: Hannes Payer,
Message:
Committed patchset #1 manually as r17367.
Description:
Revert "Add window.performance.now() to the d8 shell."
This reverts commit r17366 for breaking the mozilla tests.
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=17367
Please review this at https://codereview.chromium.org/38753006/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+0, -84 lines):
M src/d8.h
M src/d8.cc
D test/mjsunit/d8-performance-now.js
M test/mjsunit/mjsunit.status
Index: test/mjsunit/d8-performance-now.js
diff --git a/test/mjsunit/d8-performance-now.js
b/test/mjsunit/d8-performance-now.js
deleted file mode 100644
index
759fed3054bef8281c96c0ec929f4a7aab3dd94b..0000000000000000000000000000000000000000
--- a/test/mjsunit/d8-performance-now.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 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:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided
-// with the distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Flags: --allow-natives-syntax
-
-// Test the window.performance.now() function of d8. This test only makes
-// sense with d8.
-
-// Don't run this test in gc stress mode. Time differences may be long
-// due to garbage collections.
-%SetFlags("--gc-interval=-1");
-%SetFlags("--nostress-compaction");
-
-(function run() {
- var start_test = window.performance.now();
- // Let the retry run for maximum 100ms to reduce flakiness.
- for (var start = window.performance.now();
- start - start_test < 100;
- start = window.performance.now()) {
- var end = window.performance.now();
- assertTrue(start >= start_test);
- assertTrue(end >= start);
- while (end - start == 0) {
- var next = window.performance.now();
- assertTrue(next >= end);
- end = next;
- }
- if (end - start <= 1) {
- // Found (sub-)millisecond granularity.
- return;
- } else {
- print("Timer difference too big: " + (end - start) + "ms");
- }
- }
- assertTrue(false);
-})()
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
0efaeb76af56f18e73ecceb23a898b9351aa2706..96407a897c98b1284a3f9b1dd78bb457c5b08bd7
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -166,7 +166,6 @@ Persistent<Context> Shell::utility_context_;
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,15 +289,6 @@ int PerIsolateData::RealmFind(Handle<Context> context)
{
}
-// window.performance.now() returns a time stamp as double, measured in
-// milliseconds.
-void Shell::WindowPerformanceNow(
- const v8::FunctionCallbackInfo<v8::Value>& args) {
- i::TimeDelta delta = i::TimeTicks::HighResolutionNow() - kInitialTicks;
- args.GetReturnValue().Set(delta.InMillisecondsF());
-}
-
-
// Realm.current() returns the index of the currently active realm.
void Shell::RealmCurrent(const v8::FunctionCallbackInfo<v8::Value>& args) {
Isolate* isolate = args.GetIsolate();
@@ -882,13 +872,6 @@ Handle<ObjectTemplate>
Shell::CreateGlobalTemplate(Isolate* isolate) {
RealmSharedGet, RealmSharedSet);
global_template->Set(String::New("Realm"), realm_template);
- Handle<ObjectTemplate> window_template = ObjectTemplate::New();
- Handle<ObjectTemplate> performance_template = ObjectTemplate::New();
- performance_template->Set(String::New("now"),
- FunctionTemplate::New(WindowPerformanceNow));
- window_template->Set(String::New("performance"), performance_template);
- global_template->Set(String::New("window"), window_template);
-
#if !defined(V8_SHARED) && !defined(_WIN32) && !defined(_WIN64)
Handle<ObjectTemplate> os_templ = ObjectTemplate::New();
AddOSMethods(os_templ);
Index: src/d8.h
diff --git a/src/d8.h b/src/d8.h
index
5c7ffaa5bd73ec571a7f603215f0cf3fde2a372f..42013e866d1ef6948ac35ad4e7690d44cf345770
100644
--- a/src/d8.h
+++ b/src/d8.h
@@ -304,8 +304,6 @@ class Shell : public i::AllStatic {
#endif // ENABLE_DEBUGGER_SUPPORT
#endif // V8_SHARED
- static void WindowPerformanceNow(
- const v8::FunctionCallbackInfo<v8::Value>& args);
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);
@@ -383,7 +381,6 @@ class Shell : public i::AllStatic {
static const char* kPrompt;
static ShellOptions options;
- static const i::TimeTicks kInitialTicks;
private:
static Persistent<Context> evaluation_context_;
Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index
5ba166f83cc2b11a1c0e9d0a3c55b24a9d612aa6..a7939d73bb7462b7bc4b1973af20117625c52146
100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -59,10 +59,6 @@
'regress/regress-crbug-217858': [PASS, ['mode == debug', SKIP]],
##############################################################################
- # No need to waste time for this test.
- 'd8-performance-now': [PASS, NO_VARIANTS],
-
-
##############################################################################
# These use a built-in that's only present in debug mode. They take
# too long to run in debug mode on ARM and MIPS.
'fuzz-natives-part*': [PASS, ['mode == release or arch == arm or arch ==
android_arm or arch == mipsel', SKIP]],
--
--
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.
