[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 3b8f6e3e5a5c964587b56626a7aebc2ca54dbce5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 18:23:53 2003 +0000

            Reviewed by John.
    
    	- fixed 3213093 -- accessing menu items immediately after launch causes crash when about:blank is homepage
    
            * khtml/khtmlview.cpp: (isSubmitImage): Add check for node of 0.
    
            - fixed 3211461 -- crash in KWQListIteratorImpl tabbing through w3c test page
    
            * kwq/KWQKHTMLPart.h: Added childFrameForPart function, better than KHTMLPart::frame because it works
            for HTML frames inside objects as well as plain old HTML frames.
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::childFrameForPart): Like KHTMLPart::frame, but looks through m_objects too.
            (KWQKHTMLPart::nextKeyViewInFrameHierarchy): Use childFrameForPart instead of frame function.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4b68aaa..32ccd09 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-03-31  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3213093 -- accessing menu items immediately after launch causes crash when about:blank is homepage
+
+        * khtml/khtmlview.cpp: (isSubmitImage): Add check for node of 0.
+        
+        - fixed 3211461 -- crash in KWQListIteratorImpl tabbing through w3c test page
+
+        * kwq/KWQKHTMLPart.h: Added childFrameForPart function, better than KHTMLPart::frame because it works
+        for HTML frames inside objects as well as plain old HTML frames.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::childFrameForPart): Like KHTMLPart::frame, but looks through m_objects too.
+        (KWQKHTMLPart::nextKeyViewInFrameHierarchy): Use childFrameForPart instead of frame function.
+
 2003-03-30  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
@@ -257,7 +273,7 @@
         * kwq/KWQKHTMLPart.mm:
         (KWQKHTMLPart::KWQKHTMLPart):
 
-1969-12-31  Maciej Stachowiak  <mjs at apple.com>
+2003-03-26  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Trey.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4b68aaa..32ccd09 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-03-31  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3213093 -- accessing menu items immediately after launch causes crash when about:blank is homepage
+
+        * khtml/khtmlview.cpp: (isSubmitImage): Add check for node of 0.
+        
+        - fixed 3211461 -- crash in KWQListIteratorImpl tabbing through w3c test page
+
+        * kwq/KWQKHTMLPart.h: Added childFrameForPart function, better than KHTMLPart::frame because it works
+        for HTML frames inside objects as well as plain old HTML frames.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::childFrameForPart): Like KHTMLPart::frame, but looks through m_objects too.
+        (KWQKHTMLPart::nextKeyViewInFrameHierarchy): Use childFrameForPart instead of frame function.
+
 2003-03-30  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
@@ -257,7 +273,7 @@
         * kwq/KWQKHTMLPart.mm:
         (KWQKHTMLPart::KWQKHTMLPart):
 
-1969-12-31  Maciej Stachowiak  <mjs at apple.com>
+2003-03-26  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Trey.
 
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index a44e824..c62e48f 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -551,7 +551,8 @@ void KHTMLView::viewportMouseDoubleClickEvent( QMouseEvent *_mouse )
 
 static bool isSubmitImage(DOM::NodeImpl *node)
 {
-    return node->isHTMLElement()
+    return node
+        && node->isHTMLElement()
         && node->id() == ID_INPUT
         && static_cast<HTMLInputElementImpl*>(node)->inputType() == HTMLInputElementImpl::IMAGE;
 }
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index af8e36c..c175588 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -215,6 +215,7 @@ private:
     NSView *nextKeyViewInFrame(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
     static DOM::NodeImpl *nodeForWidget(const QWidget *);
     static KWQKHTMLPart *partForNode(DOM::NodeImpl *);
+    khtml::ChildFrame *childFrameForPart(const KParts::ReadOnlyPart *) const;
     
     WebCoreBridge *_bridge;
     
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fe09c50..6956832 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -681,6 +681,25 @@ NSView *KWQKHTMLPart::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection d
     }
 }
 
+ChildFrame *KWQKHTMLPart::childFrameForPart(const ReadOnlyPart *part) const
+{
+    FrameIt it = d->m_frames.begin();
+    FrameIt end = d->m_frames.end();
+    for (; it != end; ++it) {
+	if ((*it).m_part == part) {
+            return &*it;
+        }
+    }
+    it = d->m_objects.begin();
+    end = d->m_objects.end();
+    for (; it != end; ++it) {
+	if ((*it).m_part == part) {
+            return &*it;
+        }
+    }
+    return 0;
+}
+
 NSView *KWQKHTMLPart::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDirection direction)
 {
     NSView *next = nextKeyViewInFrame(node, direction);
@@ -688,9 +707,9 @@ NSView *KWQKHTMLPart::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDi
         return next;
     }
     
-    KHTMLPart *parent = parentPart();
+    KWQKHTMLPart *parent = KWQ(parentPart());
     if (parent) {
-        next = KWQ(parent)->nextKeyView(parent->frame(this)->m_frame->element(), direction);
+        next = parent->nextKeyView(parent->childFrameForPart(this)->m_frame->element(), direction);
         if (next) {
             return next;
         }

-- 
WebKit Debian packaging