diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 04:45:14 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 04:45:14 +0000 |
| commit | 6514f7f9dda5b9417700d939e8b13af66182fe35 (patch) | |
| tree | 6a6ea8b439d8bfbf171d47963b95e72f05d49c08 | |
| parent | 2f3e926ee34a6ed581e1824464fef7d140893eba (diff) | |
| download | chromium_src-6514f7f9dda5b9417700d939e8b13af66182fe35.zip chromium_src-6514f7f9dda5b9417700d939e8b13af66182fe35.tar.gz chromium_src-6514f7f9dda5b9417700d939e8b13af66182fe35.tar.bz2 | |
Test reverting to WebKit's implementation of WTF::currentTime() to see if it
explains the intl1 page cycler regression.
This is a windows only change.
TBR=dglazkov
Review URL: http://codereview.chromium.org/40096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10867 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/WebKit/WebKit.vcproj | 4 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 502ca67..77c5799 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -174,6 +174,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Deque.h" > </File> diff --git a/webkit/build/WebKit/WebKit.vcproj b/webkit/build/WebKit/WebKit.vcproj index 6b798b7..78af05a 100644 --- a/webkit/build/WebKit/WebKit.vcproj +++ b/webkit/build/WebKit/WebKit.vcproj @@ -180,10 +180,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\ChromiumCurrentTime.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\ChromiumThreading.cpp" > </File> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index e726a6c..745f27c 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -6,6 +6,11 @@ #include "base/message_loop.h" +// HACK for testing purposes only. Just trying a change on the buildbots. +#if defined(OS_WIN) +namespace WTF { double currentTime(); } +#endif + namespace webkit_glue { WebKitClientImpl::WebKitClientImpl() @@ -18,7 +23,11 @@ WebKit::WebClipboard* WebKitClientImpl::clipboard() { } double WebKitClientImpl::currentTime() { +#if defined(OS_WIN) + return WTF::currentTime(); +#else return base::Time::Now().ToDoubleT(); +#endif } void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) { |