From 9f98e659dd551f226c60a78736fe0e91fd2c28ef Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Fri, 18 Mar 2016 08:35:22 -0700 Subject: [PATCH] Bug 1252256, part 11 - Rename expectedHandlerCalls to expectedAsyncHandlerCalls. r=masayuki This variable is only needed for async handler calls. --- dom/events/test/test_dom_wheel_event.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dom/events/test/test_dom_wheel_event.html b/dom/events/test/test_dom_wheel_event.html index f163875e0092..754786787a98 100644 --- a/dom/events/test/test_dom_wheel_event.html +++ b/dom/events/test/test_dom_wheel_event.html @@ -196,7 +196,7 @@ function* testDeltaMultiplierPrefs() ]; var currentTest, currentModifiers, currentEvent, currentPref, currentMultiplier, testingExpected; - var expectedHandlerCalls; + var expectedAsyncHandlerCalls; var description; var calledHandlers = { wheel: false, DOMMouseScroll: { horizontal: false, vertical: false }, @@ -226,7 +226,7 @@ function* testDeltaMultiplierPrefs() is(aEvent.deltaY, expectedDeltaY, description + "deltaY (" + currentEvent.deltaY + ") was invalid"); is(aEvent.deltaZ, expectedDeltaZ, description + "deltaZ (" + currentEvent.deltaZ + ") was invalid"); - if (--expectedHandlerCalls == 0) { + if (--expectedAsyncHandlerCalls == 0) { setTimeout(continueTest, 0); } } @@ -288,7 +288,7 @@ function* testDeltaMultiplierPrefs() aEvent.preventDefault(); - if (--expectedHandlerCalls == 0) { + if (--expectedAsyncHandlerCalls == 0) { setTimeout(continueTest, 0); } } @@ -348,12 +348,12 @@ function* testDeltaMultiplierPrefs() var expectedMozMouseX = expectedProps.deltaX >= 1 || expectedProps.deltaX <= -1; var expectedMozMouseY = expectedProps.deltaY >= 1 || expectedProps.deltaY <= -1; - expectedHandlerCalls = 0; - if (expectedWheel) ++expectedHandlerCalls; - if (expectedDOMMouseX) ++expectedHandlerCalls; - if (expectedDOMMouseY) ++expectedHandlerCalls; - if (expectedMozMouseX) ++expectedHandlerCalls; - if (expectedMozMouseY) ++expectedHandlerCalls; + expectedAsyncHandlerCalls = 0; + if (expectedWheel) ++expectedAsyncHandlerCalls; + if (expectedDOMMouseX) ++expectedAsyncHandlerCalls; + if (expectedDOMMouseY) ++expectedAsyncHandlerCalls; + if (expectedMozMouseX) ++expectedAsyncHandlerCalls; + if (expectedMozMouseY) ++expectedAsyncHandlerCalls; description = "testDeltaMultiplierPrefs, pref: " + currentPref + "=" + kPrefValues[j] + ", deltaMode: " + currentEvent.deltaMode + ", modifiers: \"" + modifierList + "\", (trusted event): ";