Bug 973660 - TEST-UNEXPECTED-FAIL AsyncPanZoomController.LongPress when touch action enabled r=drs,kats

This commit is contained in:
Maksim Lebedev 2014-02-24 01:31:18 -05:00
parent 9a72df76f8
commit 75a9a7ddd0

View File

@ -713,7 +713,8 @@ TEST(AsyncPanZoomController, MediumPress) {
apzc->Destroy();
}
TEST(AsyncPanZoomController, LongPress) {
void
DoLongPressTest(bool aShouldUseTouchAction, uint32_t aBehavior) {
nsRefPtr<MockContentControllerDelayed> mcc = new MockContentControllerDelayed();
nsRefPtr<TestAPZCTreeManager> tm = new TestAPZCTreeManager();
nsRefPtr<TestAsyncPanZoomController> apzc = new TestAsyncPanZoomController(
@ -723,6 +724,11 @@ TEST(AsyncPanZoomController, LongPress) {
apzc->NotifyLayersUpdated(TestFrameMetrics(), true);
apzc->UpdateZoomConstraints(ZoomConstraints(false, CSSToScreenScale(1.0), CSSToScreenScale(1.0)));
nsTArray<uint32_t> values;
values.AppendElement(aBehavior);
apzc->SetTouchActionEnabled(aShouldUseTouchAction);
apzc->SetAllowedTouchBehavior(values);
int time = 0;
nsEventStatus status = ApzcDown(apzc, 10, 10, time);
@ -839,6 +845,17 @@ TEST(AsyncPanZoomController, LongPressPreventDefault) {
apzc->Destroy();
}
TEST(AsyncPanZoomController, LongPress) {
DoLongPressTest(false, mozilla::layers::AllowedTouchBehavior::NONE);
}
TEST(AsyncPanZoomController, LongPressPanAndZoom) {
DoLongPressTest(true, mozilla::layers::AllowedTouchBehavior::HORIZONTAL_PAN
| mozilla::layers::AllowedTouchBehavior::VERTICAL_PAN
| mozilla::layers::AllowedTouchBehavior::ZOOM);
}
// Layer tree for HitTesting1
static already_AddRefed<mozilla::layers::Layer>
CreateTestLayerTree1(nsRefPtr<LayerManager>& aLayerManager, nsTArray<nsRefPtr<Layer> >& aLayers) {