Bug 997235 - Followup to bug 986752 - CSS :active states get stuck with multiple on-screen touches. r=botond, a=1.4+
authorVivien Nicolas <vnicolas@mozilla.com>
Wed, 23 Apr 2014 09:15:00 -0400
changeset 192106 5973192ff0962f83248375c0b55d058ff6eb18ad
parent 192105 354953dcd67cfba0c48d1689764ef20b98a34d90
child 192107 738aa984eef43b8dac83fab3395eda86e0ed03df
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond, 1
bugs997235, 986752
milestone30.0a2
Bug 997235 - Followup to bug 986752 - CSS :active states get stuck with multiple on-screen touches. r=botond, a=1.4+
dom/browser-element/BrowserElementPanning.js
--- a/dom/browser-element/BrowserElementPanning.js
+++ b/dom/browser-element/BrowserElementPanning.js
@@ -136,16 +136,17 @@ const ContentPanning = {
     return null;
   },
 
   onTouchStart: function cp_onTouchStart(evt) {
     let screenX, screenY;
     if (this.watchedEventsType == 'touch') {
       if ('primaryPointerId' in this || evt.touches.length >= 2) {
         this._resetActive();
+        this._finishPanning();
         return;
       }
 
       let firstTouch = evt.changedTouches[0];
       this.primaryPointerId = firstTouch.identifier;
       this.pointerDownTarget = firstTouch.target;
       screenX = firstTouch.screenX;
       screenY = firstTouch.screenY;