diff options
Diffstat (limited to 'webkit')
| -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, 4 insertions, 13 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 77c5799..502ca67 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -174,10 +174,6 @@ > </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 78af05a..6b798b7 100644 --- a/webkit/build/WebKit/WebKit.vcproj +++ b/webkit/build/WebKit/WebKit.vcproj @@ -180,6 +180,10 @@ > </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 745f27c..e726a6c 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -6,11 +6,6 @@ #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() @@ -23,11 +18,7 @@ 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)()) { |