Bug 1256562 part.1 Implement nsCocoaUtils::GetEventTimeStamp() to convert from timeStamp of NSEvent to TimeStamp r=birtles,mstange

This patch implements nsCocoaUtils::GetEventTimeStamp() which hides how to get TimeStamp from timeStamp of NSEvent from other developers.

Different from Windows and GTK, we don't need to use SystemTimeConverter and implement CurrentTimeGetter class because the internal value of the macOS implementation of TimeStamp is based on mach_absolute_time(), which measures "ticks" since boot. Event timestamps are NSTimeIntervals (seconds) since boot. So the two time representations already have the same base; we only need to convert seconds into ticks.

MozReview-Commit-ID: LvioyJOM7S9
This commit is contained in:
Masayuki Nakano
2016-12-26 12:23:37 +09:00
parent e92f01e33b
commit 2d4bfac20e
2 changed files with 26 additions and 0 deletions

View File

@@ -34,6 +34,7 @@ enum {
class nsIWidget; class nsIWidget;
namespace mozilla { namespace mozilla {
class TimeStamp;
namespace gfx { namespace gfx {
class SourceSurface; class SourceSurface;
} // namespace gfx } // namespace gfx
@@ -377,6 +378,12 @@ public:
const nsTArray<mozilla::FontRange>& aFontRanges, const nsTArray<mozilla::FontRange>& aFontRanges,
const bool aIsVertical, const bool aIsVertical,
const CGFloat aBackingScaleFactor); const CGFloat aBackingScaleFactor);
/**
* Compute TimeStamp from an event's timestamp.
* If aEventTime is 0, this returns current timestamp.
*/
static mozilla::TimeStamp GetEventTimeStamp(NSTimeInterval aEventTime);
}; };
#endif // nsCocoaUtils_h_ #endif // nsCocoaUtils_h_

View File

@@ -1020,3 +1020,22 @@ nsCocoaUtils::GetNSMutableAttributedString(
NS_OBJC_END_TRY_ABORT_BLOCK_NIL NS_OBJC_END_TRY_ABORT_BLOCK_NIL
} }
TimeStamp
nsCocoaUtils::GetEventTimeStamp(NSTimeInterval aEventTime)
{
if (!aEventTime) {
// If the event is generated by a 3rd party application, its timestamp
// may be 0. In this case, just return current timestamp.
// XXX Should we cache last event time?
return TimeStamp::Now();
}
// The internal value of the macOS implementation of TimeStamp is based on
// mach_absolute_time(), which measures "ticks" since boot.
// Event timestamps are NSTimeIntervals (seconds) since boot. So the two time
// representations already have the same base; we only need to convert
// seconds into ticks.
int64_t tick =
BaseTimeDurationPlatformUtils::TicksFromMilliseconds(aEventTime * 1000.0);
return TimeStamp::FromSystemTime(tick);
}