[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 db94bcf5efa7e3ebe5d687ce828c1b74d8aa4d8c
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 25 16:45:32 2002 +0000

    	Fixed 2911915 (Exception in -[IFWebView mouseMoved])
    
    	* WebView.subproj/IFWebView.mm:
    	(-[IFWebView mouseDown:]): Changed "mouseUp" to "mouseDown"
    	in exception message.
    
    	(-[IFWebView mouseMoved:]): Removed bogus event-type checking
    	that caused this method to (always?) throw an exception when
    	invoked.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5680f6a..e2cccce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-25  John Sullivan  <sullivan at apple.com>
+
+	Fixed 2911915 (Exception in -[IFWebView mouseMoved])
+
+	* WebView.subproj/IFWebView.mm:
+	(-[IFWebView mouseDown:]): Changed "mouseUp" to "mouseDown"
+	in exception message.
+
+	(-[IFWebView mouseMoved:]): Removed bogus event-type checking
+	that caused this method to (always?) throw an exception when
+	invoked.
+
 2002-04-24  Chris Blumenberg  <cblu at apple.com>
 
 	Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5680f6a..e2cccce 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-04-25  John Sullivan  <sullivan at apple.com>
+
+	Fixed 2911915 (Exception in -[IFWebView mouseMoved])
+
+	* WebView.subproj/IFWebView.mm:
+	(-[IFWebView mouseDown:]): Changed "mouseUp" to "mouseDown"
+	in exception message.
+
+	(-[IFWebView mouseMoved:]): Removed bogus event-type checking
+	that caused this method to (always?) throw an exception when
+	invoked.
+
 2002-04-24  Chris Blumenberg  <cblu at apple.com>
 
 	Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 85b9197..69f44af 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -422,7 +422,7 @@
         state = Qt::MidButton;
     }
     else {
-        [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
+        [NSException raise:IFRuntimeError format:@"IFWebView::mouseDown: unknown button type"];
         button = 0; state = 0; // Shutup the compiler.
     }
     NSPoint p = [event locationInWindow];
@@ -436,27 +436,9 @@
 
 - (void)mouseMoved: (NSEvent *)event
 {
-    int button, state;
-     
-    if ([event type] == NSLeftMouseDown){
-        button = Qt::LeftButton;
-        state = Qt::LeftButton;
-    }
-    else if ([event type] == NSRightMouseDown){
-        button = Qt::RightButton;
-        state = Qt::RightButton;
-    }
-    else if ([event type] == NSOtherMouseDown){
-        button = Qt::MidButton;
-        state = Qt::MidButton;
-    }
-    else {
-        [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
-        button = 0; state = 0; // Shutup the compiler.
-    }
     NSPoint p = [event locationInWindow];
     
-    QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+    QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
     KHTMLView *widget = _private->widget;
     if (widget != 0l) {
         widget->viewportMouseMoveEvent(kEvent);
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 85b9197..69f44af 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -422,7 +422,7 @@
         state = Qt::MidButton;
     }
     else {
-        [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
+        [NSException raise:IFRuntimeError format:@"IFWebView::mouseDown: unknown button type"];
         button = 0; state = 0; // Shutup the compiler.
     }
     NSPoint p = [event locationInWindow];
@@ -436,27 +436,9 @@
 
 - (void)mouseMoved: (NSEvent *)event
 {
-    int button, state;
-     
-    if ([event type] == NSLeftMouseDown){
-        button = Qt::LeftButton;
-        state = Qt::LeftButton;
-    }
-    else if ([event type] == NSRightMouseDown){
-        button = Qt::RightButton;
-        state = Qt::RightButton;
-    }
-    else if ([event type] == NSOtherMouseDown){
-        button = Qt::MidButton;
-        state = Qt::MidButton;
-    }
-    else {
-        [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
-        button = 0; state = 0; // Shutup the compiler.
-    }
     NSPoint p = [event locationInWindow];
     
-    QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+    QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
     KHTMLView *widget = _private->widget;
     if (widget != 0l) {
         widget->viewportMouseMoveEvent(kEvent);

-- 
WebKit Debian packaging