dom/ipc/CoalescedWheelData.cpp
author Simon Whitehead <chemnova@gmail.com>
Sat, 13 May 2017 15:12:15 -0500
changeset 358329 633151f5d481d49bd39900d43e6a75d77459a7bb
parent 347109 1b47b363a447fbe4906b4ba71369d1c6f8c32795
child 375872 1edccf6d5a8a2eb9a71be9365ce405b6065be587
permissions -rw-r--r--
servo: Merge #16829 - Disallow negative duration for animation and transition (from hiikezoe:disallow-negative-duration); r=emilio <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15343 <!-- Either: --> - [X] There are tests for these changes written by @simon-whitehead . Thank you! <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4613c0382ab76263fb8202ccf52f4c0520e44809

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "base/basictypes.h"

#include "CoalescedWheelData.h"
#include "FrameMetrics.h"

using namespace mozilla;
using namespace mozilla::dom;

void
CoalescedWheelData::Coalesce(const WidgetWheelEvent& aEvent,
                             const ScrollableLayerGuid& aGuid,
                             const uint64_t& aInputBlockId)
{
  if (IsEmpty()) {
    mCoalescedWheelEvent = MakeUnique<WidgetWheelEvent>(aEvent);
    mGuid = aGuid;
    mInputBlockId = aInputBlockId;
  } else {
    MOZ_ASSERT(mGuid == aGuid);
    MOZ_ASSERT(mInputBlockId == aInputBlockId);
    MOZ_ASSERT(mCoalescedWheelEvent->mModifiers == aEvent.mModifiers);
    MOZ_ASSERT(mCoalescedWheelEvent->mDeltaMode == aEvent.mDeltaMode);
    MOZ_ASSERT(mCoalescedWheelEvent->mCanTriggerSwipe ==
               aEvent.mCanTriggerSwipe);
    mCoalescedWheelEvent->mDeltaX += aEvent.mDeltaX;
    mCoalescedWheelEvent->mDeltaY += aEvent.mDeltaY;
    mCoalescedWheelEvent->mDeltaZ += aEvent.mDeltaZ;
    mCoalescedWheelEvent->mLineOrPageDeltaX += aEvent.mLineOrPageDeltaX;
    mCoalescedWheelEvent->mLineOrPageDeltaY += aEvent.mLineOrPageDeltaY;
    mCoalescedWheelEvent->mTimeStamp = aEvent.mTimeStamp;
  }
}

bool
CoalescedWheelData::CanCoalesce(const WidgetWheelEvent& aEvent,
                                const ScrollableLayerGuid& aGuid,
                                const uint64_t& aInputBlockId)
{
  MOZ_ASSERT(!IsEmpty());
  return !mCoalescedWheelEvent ||
         (mCoalescedWheelEvent->mRefPoint == aEvent.mRefPoint &&
          mCoalescedWheelEvent->mModifiers == aEvent.mModifiers &&
          mCoalescedWheelEvent->mDeltaMode == aEvent.mDeltaMode &&
          mCoalescedWheelEvent->mCanTriggerSwipe == aEvent.mCanTriggerSwipe &&
          mGuid == aGuid &&
          mInputBlockId == aInputBlockId);
}