[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 9cc8c5ce59222f0a2a76266bda0411a015f2f307
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 10 07:45:58 2003 +0000

    	- fixed 3449405 - REGRESSION: reproducible crash changing focus w/ button on page, e.g. on www.aa.com
    
    	More fallout from the exception blocking.
    
            * kwq/KWQButton.mm:
            (QButton::focusPolicy): Don't return from exception block (caught
    	by Darin).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9ab9b6a..6751a36 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-10-10  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3449405 - REGRESSION: reproducible crash changing focus w/ button on page, e.g. on www.aa.com
+	
+	More fallout from the exception blocking.
+
+        * kwq/KWQButton.mm:
+        (QButton::focusPolicy): Don't return from exception block (caught
+	by Darin).
+
 2003-10-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9ab9b6a..6751a36 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-10  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3449405 - REGRESSION: reproducible crash changing focus w/ button on page, e.g. on www.aa.com
+	
+	More fallout from the exception blocking.
+
+        * kwq/KWQButton.mm:
+        (QButton::focusPolicy): Don't return from exception block (caught
+	by Darin).
+
 2003-10-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index 79e3016..927efc8 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -254,16 +254,20 @@ NSControlSize KWQNSControlSizeForFont(const QFont &f)
 
 QWidget::FocusPolicy QButton::focusPolicy() const
 {
+    volatile bool fullKeyboardMode = false;
+    
     KWQ_BLOCK_NS_EXCEPTIONS;
 
     // Add an additional check here.
     // For now, buttons are only focused when full
     // keyboard access is turned on.
-    if ([KWQKHTMLPart::bridgeForWidget(this) keyboardUIMode] != WebCoreFullKeyboardAccess)
-        return NoFocus;
+    fullKeyboardMode = [KWQKHTMLPart::bridgeForWidget(this) keyboardUIMode] == WebCoreFullKeyboardAccess;
 
     KWQ_UNBLOCK_NS_EXCEPTIONS;
 
+    if (!fullKeyboardMode)
+        return NoFocus;
+
     return QWidget::focusPolicy();
 }
 

-- 
WebKit Debian packaging