Bug 1124099 - Make sure that we skip over scrollinfo layers properly with event-regions disabled. r=botond, a=lmandel
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 23 Jan 2015 15:12:10 -0500
changeset 249699 bf8bbdbabd940dfec91ea371c5e8cb826af50a4e
parent 249698 bcab77a47096eaab669929609a830f13034021e9
child 249700 24835d0bdd5a98f9dbd64c27919b5c886a8cdc06
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond, lmandel
bugs1124099
milestone37.0a2
Bug 1124099 - Make sure that we skip over scrollinfo layers properly with event-regions disabled. r=botond, a=lmandel
gfx/layers/apz/src/APZCTreeManager.cpp
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -1415,16 +1415,20 @@ APZCTreeManager::GetAPZCAtPoint(HitTesti
         for (HitTestingTreeNode* n = node->GetPrevSibling(); n; n = n->GetPrevSibling()) {
           if (n->GetApzc()) {
             prevSiblingApzc = n->GetApzc();
             break;
           }
         }
         if (result == prevSiblingApzc) {
           APZCTM_LOG("Continuing search past probable scrollinfo info layer\n");
+          // We need to reset aOutHitResult in order to keep searching. This is
+          // ok because we know that we will at least hit prevSiblingApzc
+          // again, which is the same as result.
+          *aOutHitResult = HitNothing;
           continue;
         }
       }
 
       return result;
     }
   }