diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 04:01:10 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 04:01:10 +0000 |
| commit | 9deaf306197e5137e7acc920a25873242e6f8c10 (patch) | |
| tree | 3ae6852881d60a1da45834092c54dc19f59498c7 /webkit/tools | |
| parent | ec0b6c4eab34c0018869aad1e215aaa3868b3b55 (diff) | |
| download | chromium_src-9deaf306197e5137e7acc920a25873242e6f8c10.zip chromium_src-9deaf306197e5137e7acc920a25873242e6f8c10.tar.gz chromium_src-9deaf306197e5137e7acc920a25873242e6f8c10.tar.bz2 | |
Revert 57386:
The interval test started failing after we rolled back to a previous version of Webkit. This code
does not seem to support it.
Original description: Move the chromium.Interval to chrome.Interval as part of the benchmarking
extension. This means that users will need to use --enable-benchmarking
to access it. It really shouldn't be part of the exposed API.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3126029
TBR=mbelshe@chromium.org
Review URL: http://codereview.chromium.org/3186033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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); |