2014-08-31 15:38:00 -07:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=2 sts=2 et sw=2 tw=80: */
|
|
|
|
/* Copyright 2014 Mozilla Foundation and Mozilla contributors
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "FrameMetrics.h"
|
|
|
|
#include "GeckoProfiler.h"
|
|
|
|
#include "GeckoTouchDispatcher.h"
|
|
|
|
#include "InputData.h"
|
2014-09-05 12:39:59 -07:00
|
|
|
#include "ProfilerMarkers.h"
|
2014-08-31 15:38:00 -07:00
|
|
|
#include "base/basictypes.h"
|
|
|
|
#include "gfxPrefs.h"
|
|
|
|
#include "libui/Input.h"
|
|
|
|
#include "mozilla/ClearOnShutdown.h"
|
|
|
|
#include "mozilla/Mutex.h"
|
|
|
|
#include "mozilla/TimeStamp.h"
|
|
|
|
#include "mozilla/TouchEvents.h"
|
|
|
|
#include "mozilla/dom/Touch.h"
|
2015-02-10 05:24:23 -08:00
|
|
|
#include "mozilla/layers/APZThreadUtils.h"
|
2014-12-18 08:30:06 -08:00
|
|
|
#include "mozilla/layers/CompositorParent.h"
|
2014-08-31 15:38:00 -07:00
|
|
|
#include "nsAppShell.h"
|
|
|
|
#include "nsDebug.h"
|
|
|
|
#include "nsThreadUtils.h"
|
|
|
|
#include "nsWindow.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <utils/Timers.h>
|
|
|
|
|
|
|
|
#define LOG(args...) \
|
|
|
|
__android_log_print(ANDROID_LOG_INFO, "Gonk" , ## args)
|
|
|
|
|
|
|
|
// uncomment to print log resample data
|
|
|
|
// #define LOG_RESAMPLE_DATA 1
|
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
|
|
|
// Amount of time in MS before an input is considered expired.
|
|
|
|
static const uint64_t kInputExpirationThresholdMs = 1000;
|
|
|
|
|
|
|
|
static StaticRefPtr<GeckoTouchDispatcher> sTouchDispatcher;
|
|
|
|
|
2015-02-24 12:52:16 -08:00
|
|
|
/* static */ GeckoTouchDispatcher*
|
|
|
|
GeckoTouchDispatcher::GetInstance()
|
|
|
|
{
|
|
|
|
if (!sTouchDispatcher) {
|
|
|
|
sTouchDispatcher = new GeckoTouchDispatcher();
|
|
|
|
ClearOnShutdown(&sTouchDispatcher);
|
|
|
|
}
|
|
|
|
return sTouchDispatcher;
|
|
|
|
}
|
|
|
|
|
2014-08-31 15:38:00 -07:00
|
|
|
GeckoTouchDispatcher::GeckoTouchDispatcher()
|
|
|
|
: mTouchQueueLock("GeckoTouchDispatcher::mTouchQueueLock")
|
2015-03-09 09:46:04 -07:00
|
|
|
, mHavePendingTouchMoves(false)
|
2015-03-09 09:46:04 -07:00
|
|
|
, mInflightNonMoveEvents(0)
|
2014-08-31 15:38:00 -07:00
|
|
|
, mTouchEventsFiltered(false)
|
|
|
|
{
|
|
|
|
// Since GeckoTouchDispatcher is initialized when input is initialized
|
|
|
|
// and reads gfxPrefs, it is the first thing to touch gfxPrefs.
|
|
|
|
// The first thing to touch gfxPrefs MUST occur on the main thread and init
|
|
|
|
// the singleton
|
|
|
|
MOZ_ASSERT(sTouchDispatcher == nullptr);
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
gfxPrefs::GetSingleton();
|
|
|
|
|
|
|
|
mEnabledUniformityInfo = gfxPrefs::UniformityInfo();
|
|
|
|
mResamplingEnabled = gfxPrefs::TouchResampling() &&
|
2014-10-21 15:40:54 -07:00
|
|
|
gfxPrefs::HardwareVsyncEnabled();
|
2014-10-29 13:37:06 -07:00
|
|
|
mVsyncAdjust = TimeDuration::FromMilliseconds(gfxPrefs::TouchVsyncSampleAdjust());
|
|
|
|
mMaxPredict = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleMaxPredict());
|
2014-11-11 06:39:00 -08:00
|
|
|
mOldTouchThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleOldTouchThreshold());
|
2014-10-29 13:37:06 -07:00
|
|
|
mDelayedVsyncThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleVsyncDelayThreshold());
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
2015-02-24 12:52:16 -08:00
|
|
|
void
|
2014-12-18 08:30:06 -08:00
|
|
|
GeckoTouchDispatcher::SetCompositorVsyncObserver(mozilla::layers::CompositorVsyncObserver *aObserver)
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
// We assume on b2g that there is only 1 CompositorParent
|
2015-02-24 12:52:16 -08:00
|
|
|
MOZ_ASSERT(mCompositorVsyncObserver == nullptr);
|
|
|
|
if (mResamplingEnabled) {
|
|
|
|
mCompositorVsyncObserver = aObserver;
|
2014-12-18 08:30:06 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-09 09:46:04 -07:00
|
|
|
void
|
2014-10-29 13:37:06 -07:00
|
|
|
GeckoTouchDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
2015-02-24 12:52:16 -08:00
|
|
|
MOZ_ASSERT(mResamplingEnabled);
|
2015-03-09 09:46:04 -07:00
|
|
|
layers::APZThreadUtils::AssertOnControllerThread();
|
|
|
|
DispatchTouchMoveEvents(aVsyncTimestamp);
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// Touch data timestamps are in milliseconds, aEventTime is in nanoseconds
|
|
|
|
void
|
2014-10-29 13:37:06 -07:00
|
|
|
GeckoTouchDispatcher::NotifyTouch(MultiTouchInput& aTouch, TimeStamp aEventTime)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
2015-02-04 22:10:56 -08:00
|
|
|
if (mCompositorVsyncObserver) {
|
2014-12-18 08:30:06 -08:00
|
|
|
mCompositorVsyncObserver->SetNeedsComposite(true);
|
|
|
|
}
|
|
|
|
|
2014-10-16 05:02:00 -07:00
|
|
|
if (aTouch.mType == MultiTouchInput::MULTITOUCH_MOVE) {
|
|
|
|
MutexAutoLock lock(mTouchQueueLock);
|
2015-03-09 09:46:04 -07:00
|
|
|
if (mInflightNonMoveEvents > 0) {
|
|
|
|
// If we have any pending non-move events, we shouldn't resample the
|
|
|
|
// move events because we might end up dispatching events out of order.
|
|
|
|
// Instead, fall back to a non-resampling in-order dispatch until we're
|
|
|
|
// done processing the non-move events.
|
|
|
|
layers::APZThreadUtils::RunOnControllerThread(NewRunnableMethod(
|
|
|
|
this, &GeckoTouchDispatcher::DispatchTouchEvent, aTouch));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-03-09 09:46:04 -07:00
|
|
|
mTouchMoveEvents.push_back(aTouch);
|
2015-03-09 09:46:04 -07:00
|
|
|
mHavePendingTouchMoves = true;
|
2014-10-16 05:02:00 -07:00
|
|
|
if (mResamplingEnabled) {
|
|
|
|
return;
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
2015-02-10 05:24:23 -08:00
|
|
|
layers::APZThreadUtils::RunOnControllerThread(NewRunnableMethod(
|
|
|
|
this, &GeckoTouchDispatcher::DispatchTouchMoveEvents, TimeStamp::Now()));
|
2014-10-16 05:02:00 -07:00
|
|
|
} else {
|
2015-03-30 11:09:26 -07:00
|
|
|
{ // scope lock
|
2015-03-09 09:46:04 -07:00
|
|
|
MutexAutoLock lock(mTouchQueueLock);
|
|
|
|
mInflightNonMoveEvents++;
|
|
|
|
}
|
2015-02-10 05:24:23 -08:00
|
|
|
layers::APZThreadUtils::RunOnControllerThread(NewRunnableMethod(
|
2015-03-09 09:46:04 -07:00
|
|
|
this, &GeckoTouchDispatcher::DispatchTouchNonMoveEvent, aTouch));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
GeckoTouchDispatcher::DispatchTouchNonMoveEvent(MultiTouchInput aInput)
|
|
|
|
{
|
|
|
|
layers::APZThreadUtils::AssertOnControllerThread();
|
|
|
|
|
|
|
|
if (mResamplingEnabled) {
|
|
|
|
// Flush pending touch move events, if there are any
|
|
|
|
// (DispatchTouchMoveEvents will check the mHavePendingTouchMoves flag and
|
|
|
|
// bail out if there's nothing to be done).
|
|
|
|
NotifyVsync(TimeStamp::Now());
|
|
|
|
}
|
|
|
|
DispatchTouchEvent(aInput);
|
|
|
|
|
2015-03-30 11:09:26 -07:00
|
|
|
{ // scope lock
|
2015-03-09 09:46:04 -07:00
|
|
|
MutexAutoLock lock(mTouchQueueLock);
|
|
|
|
mInflightNonMoveEvents--;
|
|
|
|
MOZ_ASSERT(mInflightNonMoveEvents >= 0);
|
2014-10-16 05:02:00 -07:00
|
|
|
}
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2014-10-29 13:37:06 -07:00
|
|
|
GeckoTouchDispatcher::DispatchTouchMoveEvents(TimeStamp aVsyncTime)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
|
|
|
MultiTouchInput touchMove;
|
|
|
|
|
|
|
|
{
|
|
|
|
MutexAutoLock lock(mTouchQueueLock);
|
2015-03-09 09:46:04 -07:00
|
|
|
if (!mHavePendingTouchMoves) {
|
2014-08-31 15:38:00 -07:00
|
|
|
return;
|
|
|
|
}
|
2015-03-09 09:46:04 -07:00
|
|
|
mHavePendingTouchMoves = false;
|
2014-08-31 15:38:00 -07:00
|
|
|
|
2014-10-16 05:02:00 -07:00
|
|
|
if (mResamplingEnabled) {
|
|
|
|
int touchCount = mTouchMoveEvents.size();
|
2014-11-11 06:39:00 -08:00
|
|
|
TimeDuration vsyncTouchDiff = aVsyncTime - mTouchMoveEvents.back().mTimeStamp;
|
2014-10-16 05:02:00 -07:00
|
|
|
// The delay threshold is a positive pref, but we're testing to see if the
|
|
|
|
// vsync time is delayed from the touch, so add a negative sign.
|
|
|
|
bool isDelayedVsyncEvent = vsyncTouchDiff < -mDelayedVsyncThreshold;
|
2014-11-11 06:39:00 -08:00
|
|
|
bool isOldTouch = vsyncTouchDiff > mOldTouchThreshold;
|
|
|
|
bool resample = (touchCount > 1) && !isDelayedVsyncEvent && !isOldTouch;
|
2014-10-16 05:02:00 -07:00
|
|
|
|
|
|
|
if (!resample) {
|
|
|
|
touchMove = mTouchMoveEvents.back();
|
|
|
|
mTouchMoveEvents.clear();
|
2014-11-11 06:39:00 -08:00
|
|
|
if (!isDelayedVsyncEvent && !isOldTouch) {
|
2014-10-16 05:02:00 -07:00
|
|
|
mTouchMoveEvents.push_back(touchMove);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ResampleTouchMoves(touchMove, aVsyncTime);
|
|
|
|
}
|
|
|
|
} else {
|
2014-08-31 15:38:00 -07:00
|
|
|
touchMove = mTouchMoveEvents.back();
|
|
|
|
mTouchMoveEvents.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DispatchTouchEvent(touchMove);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2014-11-10 03:02:00 -08:00
|
|
|
Interpolate(int start, int end, TimeDuration aFrameDiff, TimeDuration aTouchDiff)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
2014-11-10 03:02:00 -08:00
|
|
|
return start + (((end - start) * aFrameDiff.ToMicroseconds()) / aTouchDiff.ToMicroseconds());
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static const SingleTouchData&
|
|
|
|
GetTouchByID(const SingleTouchData& aCurrentTouch, MultiTouchInput& aOtherTouch)
|
|
|
|
{
|
2015-01-19 15:38:00 -08:00
|
|
|
int32_t index = aOtherTouch.IndexOfTouch(aCurrentTouch.mIdentifier);
|
|
|
|
if (index < 0) {
|
|
|
|
// We can have situations where a previous touch event had 2 fingers
|
|
|
|
// and we lift 1 finger off. In those cases, we won't find the touch event
|
|
|
|
// with given id, so just return the current touch, which will be resampled
|
|
|
|
// without modification and dispatched.
|
|
|
|
return aCurrentTouch;
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
2015-01-19 15:38:00 -08:00
|
|
|
return aOtherTouch.mTouches[index];
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
2014-11-10 03:02:00 -08:00
|
|
|
|
|
|
|
// aTouchDiff is the duration between the base and current touch times
|
|
|
|
// aFrameDiff is the duration between the base and the time we're resampling to
|
2014-08-31 15:38:00 -07:00
|
|
|
static void
|
2014-11-10 03:02:00 -08:00
|
|
|
ResampleTouch(MultiTouchInput& aOutTouch,
|
|
|
|
MultiTouchInput& aBase, MultiTouchInput& aCurrent,
|
|
|
|
TimeDuration aFrameDiff, TimeDuration aTouchDiff)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
|
|
|
aOutTouch = aCurrent;
|
|
|
|
|
|
|
|
// Make sure we only resample the correct finger.
|
|
|
|
for (size_t i = 0; i < aOutTouch.mTouches.Length(); i++) {
|
2015-02-04 17:06:09 -08:00
|
|
|
const SingleTouchData& current = aCurrent.mTouches[i];
|
|
|
|
const SingleTouchData& base = GetTouchByID(current, aBase);
|
2014-08-31 15:38:00 -07:00
|
|
|
|
2014-11-10 03:02:00 -08:00
|
|
|
const ScreenIntPoint& baseTouchPoint = base.mScreenPoint;
|
2014-08-31 15:38:00 -07:00
|
|
|
const ScreenIntPoint& currentTouchPoint = current.mScreenPoint;
|
|
|
|
|
|
|
|
ScreenIntPoint newSamplePoint;
|
2014-11-10 03:02:00 -08:00
|
|
|
newSamplePoint.x = Interpolate(baseTouchPoint.x, currentTouchPoint.x, aFrameDiff, aTouchDiff);
|
|
|
|
newSamplePoint.y = Interpolate(baseTouchPoint.y, currentTouchPoint.y, aFrameDiff, aTouchDiff);
|
2014-08-31 15:38:00 -07:00
|
|
|
|
|
|
|
aOutTouch.mTouches[i].mScreenPoint = newSamplePoint;
|
|
|
|
|
|
|
|
#ifdef LOG_RESAMPLE_DATA
|
|
|
|
const char* type = "extrapolate";
|
2014-11-10 03:02:00 -08:00
|
|
|
if (aFrameDiff < aTouchDiff) {
|
2014-08-31 15:38:00 -07:00
|
|
|
type = "interpolate";
|
|
|
|
}
|
|
|
|
|
2014-11-10 03:02:00 -08:00
|
|
|
float alpha = aFrameDiff / aTouchDiff;
|
|
|
|
LOG("%s base (%d, %d), current (%d, %d) to (%d, %d) alpha %f, touch diff %d, frame diff %d\n",
|
2014-08-31 15:38:00 -07:00
|
|
|
type,
|
2014-11-10 03:02:00 -08:00
|
|
|
baseTouchPoint.x, baseTouchPoint.y,
|
2014-08-31 15:38:00 -07:00
|
|
|
currentTouchPoint.x, currentTouchPoint.y,
|
|
|
|
newSamplePoint.x, newSamplePoint.y,
|
2014-11-10 03:02:00 -08:00
|
|
|
alpha, (int)aTouchDiff.ToMilliseconds(), (int)aFrameDiff.ToMilliseconds());
|
2014-08-31 15:38:00 -07:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-10 03:02:00 -08:00
|
|
|
/*
|
|
|
|
* +> Base touch (The touch before current touch)
|
|
|
|
* |
|
|
|
|
* | +> Current touch (Latest touch)
|
|
|
|
* | |
|
|
|
|
* | | +> Maximum resample time
|
|
|
|
* | | |
|
|
|
|
* +-----+------+--------------------> Time
|
|
|
|
* ^ ^
|
|
|
|
* | |
|
|
|
|
* +------+--> Potential vsync events which the touches are resampled to
|
|
|
|
* | |
|
|
|
|
* | +> Extrapolation
|
|
|
|
* |
|
|
|
|
* +> Interpolation
|
|
|
|
*/
|
2014-08-31 15:38:00 -07:00
|
|
|
|
2014-11-10 03:02:00 -08:00
|
|
|
void
|
|
|
|
GeckoTouchDispatcher::ResampleTouchMoves(MultiTouchInput& aOutTouch, TimeStamp aVsyncTime)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
|
|
|
MOZ_RELEASE_ASSERT(mTouchMoveEvents.size() >= 2);
|
|
|
|
mTouchQueueLock.AssertCurrentThreadOwns();
|
|
|
|
|
|
|
|
MultiTouchInput currentTouch = mTouchMoveEvents.back();
|
|
|
|
mTouchMoveEvents.pop_back();
|
2014-11-10 03:02:00 -08:00
|
|
|
MultiTouchInput baseTouch = mTouchMoveEvents.back();
|
2014-08-31 15:38:00 -07:00
|
|
|
mTouchMoveEvents.clear();
|
|
|
|
mTouchMoveEvents.push_back(currentTouch);
|
|
|
|
|
2014-10-29 13:37:06 -07:00
|
|
|
TimeStamp sampleTime = aVsyncTime - mVsyncAdjust;
|
2014-11-11 06:39:00 -08:00
|
|
|
TimeDuration touchDiff = currentTouch.mTimeStamp - baseTouch.mTimeStamp;
|
2014-08-31 15:38:00 -07:00
|
|
|
|
2014-11-11 06:39:00 -08:00
|
|
|
if (currentTouch.mTimeStamp < sampleTime) {
|
2015-04-02 06:03:40 -07:00
|
|
|
TimeDuration maxResampleTime = std::min(touchDiff / int64_t(2), mMaxPredict);
|
2014-11-11 06:39:00 -08:00
|
|
|
TimeStamp maxTimestamp = currentTouch.mTimeStamp + maxResampleTime;
|
2014-11-10 03:02:00 -08:00
|
|
|
if (sampleTime > maxTimestamp) {
|
|
|
|
sampleTime = maxTimestamp;
|
|
|
|
#ifdef LOG_RESAMPLE_DATA
|
|
|
|
LOG("Overshot extrapolation time, adjusting sample time\n");
|
|
|
|
#endif
|
|
|
|
}
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
2014-11-11 06:39:00 -08:00
|
|
|
ResampleTouch(aOutTouch, baseTouch, currentTouch, sampleTime - baseTouch.mTimeStamp, touchDiff);
|
2014-11-10 03:02:00 -08:00
|
|
|
|
|
|
|
// Both mTimeStamp and mTime are being updated to sampleTime here.
|
|
|
|
// mTime needs to be updated using a delta since TimeStamp doesn't
|
|
|
|
// provide a way to obtain a raw value.
|
|
|
|
aOutTouch.mTime += (sampleTime - aOutTouch.mTimeStamp).ToMilliseconds();
|
2014-10-29 13:37:06 -07:00
|
|
|
aOutTouch.mTimeStamp = sampleTime;
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
IsExpired(const MultiTouchInput& aTouch)
|
|
|
|
{
|
|
|
|
// No pending events, the filter state can be updated.
|
|
|
|
uint64_t timeNowMs = systemTime(SYSTEM_TIME_MONOTONIC) / 1000000;
|
|
|
|
return (timeNowMs - aTouch.mTime) > kInputExpirationThresholdMs;
|
|
|
|
}
|
|
|
|
void
|
2015-02-10 05:24:23 -08:00
|
|
|
GeckoTouchDispatcher::DispatchTouchEvent(MultiTouchInput aMultiTouch)
|
2014-08-31 15:38:00 -07:00
|
|
|
{
|
2014-09-29 10:45:41 -07:00
|
|
|
if ((aMultiTouch.mType == MultiTouchInput::MULTITOUCH_END ||
|
|
|
|
aMultiTouch.mType == MultiTouchInput::MULTITOUCH_CANCEL) &&
|
2014-09-24 21:55:39 -07:00
|
|
|
aMultiTouch.mTouches.Length() == 1) {
|
2014-09-29 10:45:41 -07:00
|
|
|
MutexAutoLock lock(mTouchQueueLock);
|
|
|
|
mTouchMoveEvents.clear();
|
|
|
|
} else if (aMultiTouch.mType == MultiTouchInput::MULTITOUCH_START &&
|
|
|
|
aMultiTouch.mTouches.Length() == 1) {
|
2014-08-31 15:38:00 -07:00
|
|
|
mTouchEventsFiltered = IsExpired(aMultiTouch);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mTouchEventsFiltered) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-15 07:37:54 -08:00
|
|
|
nsWindow::DispatchTouchInput(aMultiTouch);
|
2014-08-31 15:38:00 -07:00
|
|
|
|
2014-09-05 12:39:59 -07:00
|
|
|
if (mEnabledUniformityInfo && profiler_is_active()) {
|
2014-08-31 15:38:00 -07:00
|
|
|
const char* touchAction = "Invalid";
|
|
|
|
switch (aMultiTouch.mType) {
|
|
|
|
case MultiTouchInput::MULTITOUCH_START:
|
|
|
|
touchAction = "Touch_Event_Down";
|
|
|
|
break;
|
|
|
|
case MultiTouchInput::MULTITOUCH_MOVE:
|
|
|
|
touchAction = "Touch_Event_Move";
|
|
|
|
break;
|
|
|
|
case MultiTouchInput::MULTITOUCH_END:
|
|
|
|
case MultiTouchInput::MULTITOUCH_CANCEL:
|
|
|
|
touchAction = "Touch_Event_Up";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-09-05 12:39:59 -07:00
|
|
|
const ScreenIntPoint& touchPoint = aMultiTouch.mTouches[0].mScreenPoint;
|
|
|
|
TouchDataPayload* payload = new TouchDataPayload(touchPoint);
|
|
|
|
PROFILER_MARKER_PAYLOAD(touchAction, payload);
|
2014-08-31 15:38:00 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace mozilla
|