[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 3885c4aaae5d6c6df9fdfd3a0895f5b801c35b88
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 19 21:29:36 2002 +0000

    	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add null check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c8c6533..fb62a4c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-08-19  Darin Adler  <darin at apple.com>
 
+	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add null check.
+
+2002-08-19  Darin Adler  <darin at apple.com>
+
 	Put in more robust version of the next/previous key view checking
 	that matches what I did in WebHTMLView.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c8c6533..fb62a4c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-08-19  Darin Adler  <darin at apple.com>
 
+	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add null check.
+
+2002-08-19  Darin Adler  <darin at apple.com>
+
 	Put in more robust version of the next/previous key view checking
 	that matches what I did in WebHTMLView.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c8c6533..fb62a4c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-08-19  Darin Adler  <darin at apple.com>
 
+	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add null check.
+
+2002-08-19  Darin Adler  <darin at apple.com>
+
 	Put in more robust version of the next/previous key view checking
 	that matches what I did in WebHTMLView.
 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 9eb2d94..44fa026 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -550,23 +550,19 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
             return nil;
         }
         RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(node->renderer());
-        QWidget *widget = renderWidget->widget();
-        KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
-        NSView *view;
-        if (childFrameWidget) {
-            NodeImpl *nullNode = 0;
-            view = childFrameWidget->part()->impl->nextKeyViewInFrame(nullNode, direction);
-        } else {
-            view = widget->getView();
-#if 0
-            NSView *fieldEditor = [[view window] fieldEditor:NO forObject:view];
-            if (fieldEditor) {
-                view = fieldEditor;
+        if (renderWidget) {
+            QWidget *widget = renderWidget->widget();
+            KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
+            NSView *view;
+            if (childFrameWidget) {
+                NodeImpl *nullNode = 0;
+                view = childFrameWidget->part()->impl->nextKeyViewInFrame(nullNode, direction);
+            } else {
+                view = widget->getView();
+            }
+            if (view) {
+                return view;
             }
-#endif
-        }
-        if (view) {
-            return view;
         }
     }
 }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 9eb2d94..44fa026 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -550,23 +550,19 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
             return nil;
         }
         RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(node->renderer());
-        QWidget *widget = renderWidget->widget();
-        KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
-        NSView *view;
-        if (childFrameWidget) {
-            NodeImpl *nullNode = 0;
-            view = childFrameWidget->part()->impl->nextKeyViewInFrame(nullNode, direction);
-        } else {
-            view = widget->getView();
-#if 0
-            NSView *fieldEditor = [[view window] fieldEditor:NO forObject:view];
-            if (fieldEditor) {
-                view = fieldEditor;
+        if (renderWidget) {
+            QWidget *widget = renderWidget->widget();
+            KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
+            NSView *view;
+            if (childFrameWidget) {
+                NodeImpl *nullNode = 0;
+                view = childFrameWidget->part()->impl->nextKeyViewInFrame(nullNode, direction);
+            } else {
+                view = widget->getView();
+            }
+            if (view) {
+                return view;
             }
-#endif
-        }
-        if (view) {
-            return view;
         }
     }
 }

-- 
WebKit Debian packaging