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

[darin]

The following commit has been merged in the debian/unstable branch:
commit be0c2a926944e366b79e6a68357a5ad8d12d778d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 9 20:05:25 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3223126 -- REGRESSION: exception BrowserWindow isDescendantOf:]: selector not recognized
    
            * kwq/KWQWidget.mm: (QWidget::hasFocus): Add missing check of the class of the first
            responder before calling an NSView method on it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b0455c9..5bceda8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-04-09  Darin Adler  <darin at apple.com>
 
+        Reviewed by Richard.
+
+	- fixed 3223126 -- REGRESSION: exception BrowserWindow isDescendantOf:]: selector not recognized
+
+        * kwq/KWQWidget.mm: (QWidget::hasFocus): Add missing check of the class of the first
+        responder before calling an NSView method on it.
+
+2003-04-09  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3222708 -- REGRESSION: repro crash trying to read news at nttdocomo
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0455c9..5bceda8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-04-09  Darin Adler  <darin at apple.com>
 
+        Reviewed by Richard.
+
+	- fixed 3223126 -- REGRESSION: exception BrowserWindow isDescendantOf:]: selector not recognized
+
+        * kwq/KWQWidget.mm: (QWidget::hasFocus): Add missing check of the class of the first
+        responder before calling an NSView method on it.
+
+2003-04-09  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3222708 -- REGRESSION: repro crash trying to read news at nttdocomo
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index a86603b..c7e471a 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -405,7 +405,7 @@ void RenderImage::updateFromElement()
         attr = element()->getAttribute(ATTR_SRC);
     }
     
-    // Treat a lack of src orempty string for src as no image at all, not the page itself
+    // Treat a lack of src or empty string for src as no image at all, not the page itself
     // loaded as an image.
     CachedImage *new_image;
     if (attr.isEmpty()) {
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index c265214..b54ee1d 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -174,7 +174,9 @@ bool QWidget::hasFocus() const
     // The following check handles both text field editors and the secure text field
     // that goes inside the KWQTextField (and its editor). We have to check the class
     // of the view because we don't want to be fooled by subviews of NSScrollView, for example.
-    if ([view isKindOfClass:[NSTextField class]] && [firstResponder isDescendantOf:view]) {
+    if ([view isKindOfClass:[NSTextField class]]
+            && [firstResponder isKindOfClass:[NSView class]]
+            && [firstResponder isDescendantOf:view]) {
         return true;
     }
     return false;

-- 
WebKit Debian packaging