Bug 1383365 - Add in missing code for mActiveKeyboardBlock in InputQueue. r=kats

MozReview-Commit-ID: EUq8wPS1aDZ

--HG--
extra : rebase_source : 3d684c76e67c3cbc2434e41f343232d6e6a69366
extra : source : d02ae74dab6da0990ecabcc3bcdeeaf3ba07ebf9
extra : histedit_source : d4724c5f7141ce6a9256482a9d1ebc2e1656f4de

gfx/layers/apz/src/InputQueue.cpp

@@ -578,7 +578,7 @@ InputQueue::FindBlockForId(uint64_t aInputBlockId,
     }
   }
 
-  CancelableBlockState* block = nullptr;
+  InputBlockState* block = nullptr;
   if (mActiveTouchBlock && mActiveTouchBlock->GetBlockId() == aInputBlockId) {
     block = mActiveTouchBlock.get();
   } else if (mActiveWheelBlock && mActiveWheelBlock->GetBlockId() == aInputBlockId) {
@@ -587,6 +587,8 @@ InputQueue::FindBlockForId(uint64_t aInputBlockId,
     block = mActiveDragBlock.get();
   } else if (mActivePanGestureBlock && mActivePanGestureBlock->GetBlockId() == aInputBlockId) {
     block = mActivePanGestureBlock.get();
+  } else if (mActiveKeyboardBlock && mActiveKeyboardBlock->GetBlockId() == aInputBlockId) {
+    block = mActiveKeyboardBlock.get();
   }
   // Since we didn't encounter this block while iterating through mQueuedInputs,
   // it must have no events associated with it at the moment.
@@ -749,6 +751,9 @@ InputQueue::ProcessQueue() {
   if (CanDiscardBlock(mActivePanGestureBlock)) {
     mActivePanGestureBlock = nullptr;
   }
+  if (CanDiscardBlock(mActiveKeyboardBlock)) {
+    mActiveKeyboardBlock = nullptr;
+  }
 }
 
 bool
@@ -788,6 +793,7 @@ InputQueue::Clear()
   mActiveWheelBlock = nullptr;
   mActiveDragBlock = nullptr;
   mActivePanGestureBlock = nullptr;
+  mActiveKeyboardBlock = nullptr;
   mLastActiveApzc = nullptr;
 }