[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit ce6f6df4ef930b1b5863e330794343fefd1cb65c
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 17:17:43 2002 +0000

     2002-11-13  John Sullivan  <sullivan at apple.com>
    
    	- fixed 3099922 -- REGRESSION: Back button always pops up menu
    
            * Misc.subproj/WebNSViewExtras.h:
            * Misc.subproj/WebNSViewExtras.m:
            (-[NSView _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis:]:
    	Fixed a copy/paste error I made yesterday -- this method was never
    	noticing the mouse-up events because it was checking the event type
    	against the wrong number. Also changed the hysteresis values from
    	unsigneds to floats (unsigned was just wrong).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 33ea0fd..75cd1a1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+ 2002-11-13  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3099922 -- REGRESSION: Back button always pops up menu
+
+        * Misc.subproj/WebNSViewExtras.h:
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis:]:
+	Fixed a copy/paste error I made yesterday -- this method was never
+	noticing the mouse-up events because it was checking the event type
+	against the wrong number. Also changed the hysteresis values from
+	unsigneds to floats (unsigned was just wrong).
+
 2002-11-13  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3050447 - Policy handlers have no way of telling client
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 33ea0fd..75cd1a1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+ 2002-11-13  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3099922 -- REGRESSION: Back button always pops up menu
+
+        * Misc.subproj/WebNSViewExtras.h:
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis:]:
+	Fixed a copy/paste error I made yesterday -- this method was never
+	noticing the mouse-up events because it was checking the event type
+	against the wrong number. Also changed the hysteresis values from
+	unsigneds to floats (unsigned was just wrong).
+
 2002-11-13  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3050447 - Policy handlers have no way of telling client
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index 87e98fa..79d0454 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -23,8 +23,8 @@
 // returns NO, else returns YES.
 - (BOOL)_web_dragShouldBeginFromMouseDown:(NSEvent *)mouseDownEvent
                            withExpiration:(NSDate *)expiration
-                              xHysteresis:(unsigned)xHysteresis
-                              yHysteresis:(unsigned)yHysteresis;
+                              xHysteresis:(float)xHysteresis
+                              yHysteresis:(float)yHysteresis;
 
 // Calls _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis: with
 // the default values for xHysteresis and yHysteresis
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index a390e0b..ac26065 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -50,8 +50,8 @@
 /* Determine whether a mouse down should turn into a drag; started as copy of NSTableView code */
 - (BOOL)_web_dragShouldBeginFromMouseDown:(NSEvent *)mouseDownEvent
                            withExpiration:(NSDate *)expiration
-                              xHysteresis:(unsigned)xHysteresis
-                              yHysteresis:(unsigned)yHysteresis
+                              xHysteresis:(float)xHysteresis
+                              yHysteresis:(float)yHysteresis
 {
     NSEvent *nextEvent, *firstEvent, *dragEvent, *mouseUp;
     BOOL dragIt;
@@ -88,7 +88,7 @@
                 dragIt = YES;
                 break;
             }
-        } else if ([nextEvent type] == xHysteresis) {
+        } else if ([nextEvent type] == NSLeftMouseUp) {
             mouseUp = nextEvent;
             break;
         }

-- 
WebKit Debian packaging