diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:58:58 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:58:58 +0000 |
commit | 0141ba3ca96fe156474074493b277cf2fd352cc8 (patch) | |
tree | 164445cceedac7e91d4b19a0fca8c1c757197020 /ppapi/proxy | |
parent | a8d4909721756525e14b9429db9c61a63932005d (diff) | |
download | chromium_src-0141ba3ca96fe156474074493b277cf2fd352cc8.zip chromium_src-0141ba3ca96fe156474074493b277cf2fd352cc8.tar.gz chromium_src-0141ba3ca96fe156474074493b277cf2fd352cc8.tar.bz2 |
Move the time conversion code to the PPAPI shared_impl directory and use it in
the proxy for converting event times.
This also removes the unnecessary GetInterface function from Graphics2D and
has the module use the thunk directly.
Review URL: http://codereview.chromium.org/7344009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/ppb_core_proxy.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ppapi/proxy/ppb_core_proxy.cc b/ppapi/proxy/ppb_core_proxy.cc index a67ce1d..e3b8ab6 100644 --- a/ppapi/proxy/ppb_core_proxy.cc +++ b/ppapi/proxy/ppb_core_proxy.cc @@ -16,6 +16,10 @@ #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource_tracker.h" #include "ppapi/proxy/ppapi_messages.h" +#include "ppapi/shared_impl/time_conversion.h" + +using ppapi::TimeToPPTime; +using ppapi::TimeTicksToPPTimeTicks; namespace pp { namespace proxy { @@ -45,14 +49,11 @@ void MemFree(void* ptr) { } double GetTime() { - return base::Time::Now().ToDoubleT(); + return TimeToPPTime(base::Time::Now()); } double GetTimeTicks() { - // TODO(brettw) http://code.google.com/p/chromium/issues/detail?id=57448 - // This should be a tick timer rather than wall clock time, but needs to - // match message times, which also currently use wall clock time. - return GetTime(); + return TimeTicksToPPTimeTicks(base::TimeTicks::Now()); } void CallOnMainThread(int delay_in_ms, |