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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 052427330f0eb144c1e9db7bae858018671510a0
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 23 01:01:12 2003 +0000

            Reviewed by
    
    	- fixed 3460664 - Exception handlers not properly removed
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::mouseMoved): Don't return from exception block
            (KWQKHTMLPart::khtmlMouseReleaseEvent): Add exception blocking (whoops)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d0958fd..97c7942 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-10-22  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by 
+
+	- fixed 3460664 - Exception handlers not properly removed
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::mouseMoved): Don't return from exception block
+        (KWQKHTMLPart::khtmlMouseReleaseEvent): Add exception blocking (whoops)
+
 2003-10-22  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3460652 -- REGRESSION (100-110+): Can't tab out of a 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d0958fd..97c7942 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-22  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by 
+
+	- fixed 3460664 - Exception handlers not properly removed
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::mouseMoved): Don't return from exception block
+        (KWQKHTMLPart::khtmlMouseReleaseEvent): Add exception blocking (whoops)
+
 2003-10-22  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3460652 -- REGRESSION (100-110+): Can't tab out of a 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1d30466..fcd3051 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1735,7 +1735,9 @@ void KWQKHTMLPart::khtmlMouseReleaseEvent(MouseReleaseEvent *event)
     }
     
     _sendingEventToSubview = true;
+    KWQ_BLOCK_NS_EXCEPTIONS;
     [view mouseUp:_currentEvent];
+    KWQ_UNBLOCK_NS_EXCEPTIONS;
     _sendingEventToSubview = false;
 }
 
@@ -2031,8 +2033,6 @@ void KWQKHTMLPart::sendFakeEventsAfterWidgetTracking(NSEvent *initiatingEvent)
 
 void KWQKHTMLPart::mouseMoved(NSEvent *event)
 {
-    KWQ_BLOCK_NS_EXCEPTIONS;
-
     KHTMLView *v = d->m_view;
     // Reject a mouse moved if the button is down - screws up tracking during autoscroll
     // These happen because WebKit sometimes has to fake up moved events.
@@ -2040,6 +2040,8 @@ void KWQKHTMLPart::mouseMoved(NSEvent *event)
         return;
     }
     
+    KWQ_BLOCK_NS_EXCEPTIONS;
+
     NSEvent *oldCurrentEvent = _currentEvent;
     _currentEvent = [event retain];
     

-- 
WebKit Debian packaging