End the mouse wheel scrolling transaction when forcing "passToParent" for a combobox (fixes an assertion). b=398334 r=masayuki sr=roc a1.9=beltzner
authormats.palmgren@bredband.net
Sat, 15 Mar 2008 01:52:18 -0700
changeset 13114 ebc0277f5916c1aac75ae0e7bb7027a1e696ed57
parent 13113 37d32c0aa8c77439cc33cc5840d39a823f914b96
child 13115 e1625ca024da69c0d7012fd018b16f0854d400f7
push idunknown
push userunknown
push dateunknown
reviewersmasayuki, roc
bugs398334
milestone1.9b5pre
End the mouse wheel scrolling transaction when forcing "passToParent" for a combobox (fixes an assertion). b=398334 r=masayuki sr=roc a1.9=beltzner
content/events/src/nsEventStateManager.cpp
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2183,17 +2183,20 @@ nsEventStateManager::DoScrollText(nsPres
           // Don't propagate to parent when drop down menu is active.
           if (passToParent) {
             passToParent = PR_FALSE;
             scrollView = nsnull;
             nsMouseWheelTransaction::EndTransaction();
           }
         } else {
           // Always propagate when not dropped down (even if focused).
-          passToParent = PR_TRUE;
+          if (!passToParent) {
+            passToParent = PR_TRUE;
+            nsMouseWheelTransaction::EndTransaction();
+          }
         }
       }
     }
   }
 
   if (!passToParent && scrollView) {
     PRInt32 scrollX = 0;
     PRInt32 scrollY = aNumLines;