summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/common/extensions/docs/examples/api/messaging/timer/popup.html10
-rw-r--r--chrome/renderer/render_thread.cc3
-rw-r--r--webkit/extensions/v8/benchmarking_extension.cc29
-rw-r--r--webkit/extensions/v8/interval_extension.cc58
-rw-r--r--webkit/extensions/v8/interval_extension.h22
-rw-r--r--webkit/glue/webkit_glue.gypi2
-rw-r--r--webkit/support/test_webkit_client.cc3
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.cc3
8 files changed, 93 insertions, 37 deletions
diff --git a/chrome/common/extensions/docs/examples/api/messaging/timer/popup.html b/chrome/common/extensions/docs/examples/api/messaging/timer/popup.html
index e20e799..ef5bed8 100644
--- a/chrome/common/extensions/docs/examples/api/messaging/timer/popup.html
+++ b/chrome/common/extensions/docs/examples/api/messaging/timer/popup.html
@@ -10,12 +10,6 @@ tr {
}
</style>
<script>
-if (!chrome.benchmarking) {
- alert("Warning: Looks like you forgot to run chrome with " +
- " --enable-benchmarking set.");
- return;
-}
-
function setChildTextNode(elementId, text) {
document.getElementById(elementId).innerText = text;
}
@@ -25,7 +19,7 @@ function testRequest() {
setChildTextNode("resultsRequest", "running...");
chrome.tabs.getSelected(null, function(tab) {
- var timer = new chrome.Interval();
+ var timer = new chromium.Interval();
timer.start();
chrome.tabs.sendRequest(tab.id, {counter: 1}, function handler(response) {
@@ -45,7 +39,7 @@ function testConnect() {
setChildTextNode("resultsConnect", "running...");
chrome.tabs.getSelected(null, function(tab) {
- var timer = new chrome.Interval();
+ var timer = new chromium.Interval();
timer.start();
var port = chrome.tabs.connect(tab.id);
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index c105ae3..ff2e1c1 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -87,6 +87,7 @@
#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
#include "webkit/extensions/v8/benchmarking_extension.h"
#include "webkit/extensions/v8/gears_extension.h"
+#include "webkit/extensions/v8/interval_extension.h"
#include "webkit/extensions/v8/playback_extension.h"
#include "v8/include/v8.h"
@@ -853,6 +854,8 @@ void RenderThread::EnsureWebKitInitialized() {
WebScriptController::registerExtension(extensions_v8::GearsExtension::Get());
#endif
WebScriptController::registerExtension(
+ extensions_v8::IntervalExtension::Get());
+ WebScriptController::registerExtension(
extensions_v8::LoadTimesExtension::Get());
WebScriptController::registerExtension(
extensions_v8::ExternalExtension::Get());
diff --git a/webkit/extensions/v8/benchmarking_extension.cc b/webkit/extensions/v8/benchmarking_extension.cc
index 1a30968..31bb080 100644
--- a/webkit/extensions/v8/benchmarking_extension.cc
+++ b/webkit/extensions/v8/benchmarking_extension.cc
@@ -4,7 +4,6 @@
#include "base/command_line.h"
#include "base/stats_table.h"
-#include "base/time.h"
#include "net/http/http_network_layer.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
#include "webkit/extensions/v8/benchmarking_extension.h"
@@ -46,26 +45,6 @@ class BenchmarkingWrapper : public v8::Extension {
" native function IsSingleProcess();"
" return IsSingleProcess();"
"};"
- "chrome.Interval = function() {"
- " var start_ = 0;"
- " var stop_ = 0;"
- " native function HiResTime();"
- " this.start = function() {"
- " stop_ = 0;"
- " start_ = HiResTime();"
- " };"
- " this.stop = function() {"
- " stop_ = HiResTime();"
- " if (start_ == 0)"
- " stop_ = 0;"
- " };"
- " this.microseconds = function() {"
- " var stop = stop_;"
- " if (stop == 0 && start_ != 0)"
- " stop = HiResTime();"
- " return Math.ceil(stop - start_);"
- " };"
- "}"
) {}
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
@@ -80,10 +59,7 @@ class BenchmarkingWrapper : public v8::Extension {
return v8::FunctionTemplate::New(GetCounter);
} else if (name->Equals(v8::String::New("IsSingleProcess"))) {
return v8::FunctionTemplate::New(IsSingleProcess);
- } else if (name->Equals(v8::String::New("HiResTime"))) {
- return v8::FunctionTemplate::New(HiResTime);
}
-
return v8::Handle<v8::FunctionTemplate>();
}
@@ -123,11 +99,6 @@ class BenchmarkingWrapper : public v8::Extension {
static v8::Handle<v8::Value> IsSingleProcess(const v8::Arguments& args) {
return v8::Boolean::New(webkit_glue::IsSingleProcess());
}
-
- static v8::Handle<v8::Value> HiResTime(const v8::Arguments& args) {
- return v8::Number::New(
- static_cast<double>(base::TimeTicks::HighResNow().ToInternalValue()));
- }
};
v8::Extension* BenchmarkingExtension::Get() {
diff --git a/webkit/extensions/v8/interval_extension.cc b/webkit/extensions/v8/interval_extension.cc
new file mode 100644
index 0000000..95b69a5
--- /dev/null
+++ b/webkit/extensions/v8/interval_extension.cc
@@ -0,0 +1,58 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "webkit/extensions/v8/interval_extension.h"
+#include "base/time.h"
+
+namespace extensions_v8 {
+
+const char* kIntervalExtensionName = "v8/Interval";
+
+class IntervalExtensionWrapper : public v8::Extension {
+ public:
+ IntervalExtensionWrapper()
+ : v8::Extension(
+ kIntervalExtensionName,
+ "var chromium;"
+ "if (!chromium)"
+ " chromium = {};"
+ "chromium.Interval = function() {"
+ " var start_ = 0;"
+ " var stop_ = 0;"
+ " native function HiResTime();"
+ " this.start = function() {"
+ " stop_ = 0;"
+ " start_ = HiResTime();"
+ " };"
+ " this.stop = function() {"
+ " stop_ = HiResTime();"
+ " if (start_ == 0)"
+ " stop_ = 0;"
+ " };"
+ " this.microseconds = function() {"
+ " var stop = stop_;"
+ " if (stop == 0 && start_ != 0)"
+ " stop = HiResTime();"
+ " return Math.ceil((stop - start_) * 1000000);"
+ " };"
+ "}") {}
+
+ virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
+ v8::Handle<v8::String> name) {
+ if (name->Equals(v8::String::New("HiResTime"))) {
+ return v8::FunctionTemplate::New(HiResTime);
+ }
+ return v8::Handle<v8::FunctionTemplate>();
+ }
+
+ static v8::Handle<v8::Value> HiResTime(const v8::Arguments& args) {
+ return v8::Number::New(base::Time::Now().ToDoubleT());
+ }
+};
+
+v8::Extension* IntervalExtension::Get() {
+ return new IntervalExtensionWrapper();
+}
+
+} // namespace extensions_v8
diff --git a/webkit/extensions/v8/interval_extension.h b/webkit/extensions/v8/interval_extension.h
new file mode 100644
index 0000000..83e37bc
--- /dev/null
+++ b/webkit/extensions/v8/interval_extension.h
@@ -0,0 +1,22 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// The IntervalExtension is a v8 extension to implement a simple interval
+// class for measuring microsecond intervals.
+
+#ifndef WEBKIT_EXTENSIONS_V8_INTERVAL_EXTENSION_H_
+#define WEBKIT_EXTENSIONS_V8_INTERVAL_EXTENSION_H_
+
+#include "v8/include/v8.h"
+
+namespace extensions_v8 {
+
+class IntervalExtension {
+ public:
+ static v8::Extension* Get();
+};
+
+} // namespace extensions_v8
+
+#endif // WEBKIT_EXTENSIONS_V8_INTERVAL_EXTENSION_H_
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 450a870..40cc67d 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -353,6 +353,8 @@
'../extensions/v8/gears_extension.h',
'../extensions/v8/heap_profiler_extension.cc',
'../extensions/v8/heap_profiler_extension.h',
+ '../extensions/v8/interval_extension.cc',
+ '../extensions/v8/interval_extension.h',
'../extensions/v8/playback_extension.cc',
'../extensions/v8/playback_extension.h',
'../extensions/v8/profiler_extension.cc',
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 3497377..c33545d 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -30,6 +30,7 @@
#include "webkit/database/vfs_backend.h"
#include "webkit/extensions/v8/gc_extension.h"
#include "webkit/extensions/v8/gears_extension.h"
+#include "webkit/extensions/v8/interval_extension.h"
#include "webkit/glue/simple_webmimeregistry_impl.h"
#include "webkit/glue/webclipboard_impl.h"
#include "webkit/glue/webkit_glue.h"
@@ -66,6 +67,8 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
WebScriptController::enableV8SingleThreadMode();
WebScriptController::registerExtension(
extensions_v8::GearsExtension::Get());
+ WebScriptController::registerExtension(
+ extensions_v8::IntervalExtension::Get());
WebKit::WebRuntimeFeatures::enableSockets(true);
WebKit::WebRuntimeFeatures::enableApplicationCache(true);
WebKit::WebRuntimeFeatures::enableDatabase(true);
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc
index 706eaa6..c0ac404 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.cc
+++ b/webkit/tools/test_shell/test_shell_webkit_init.cc
@@ -13,6 +13,7 @@
#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
#include "webkit/extensions/v8/gears_extension.h"
+#include "webkit/extensions/v8/interval_extension.h"
#include "webkit/tools/test_shell/test_shell.h"
#if defined(OS_WIN)
@@ -31,6 +32,8 @@ TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode) {
WebKit::WebScriptController::enableV8SingleThreadMode();
WebKit::WebScriptController::registerExtension(
extensions_v8::GearsExtension::Get());
+ WebKit::WebScriptController::registerExtension(
+ extensions_v8::IntervalExtension::Get());
WebKit::WebRuntimeFeatures::enableSockets(true);
WebKit::WebRuntimeFeatures::enableApplicationCache(true);
WebKit::WebRuntimeFeatures::enableDatabase(true);
generated by cgit v1.1 at 2025-02-19 10:51:32 +0000