[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 71013a2b17890d2434d36ac19abc3a40a5cdaaff
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 20 15:40:40 2002 +0000

    	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
    
            * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
    	Roll back the parent call to use NodeBaseImpl::attach. Not sure why I changed that
    	at the last minute before my last checkin, but it was *bad*.
    
    	- fixed a crash I observed when clicking on an about:blank page
    
            * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]): Check for nil renderer.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6f462d7..e090d6a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
+
+        * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
+	Roll back the parent call to use NodeBaseImpl::attach. Not sure why I changed that
+	at the last minute before my last checkin, but it was *bad*.
+
+	- fixed a crash I observed when clicking on an about:blank page
+
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]): Check for nil renderer.
+
 2002-10-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3075032 -- textarea contents sometimes aren't shown
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6f462d7..e090d6a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
+
+        * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
+	Roll back the parent call to use NodeBaseImpl::attach. Not sure why I changed that
+	at the last minute before my last checkin, but it was *bad*.
+
+	- fixed a crash I observed when clicking on an about:blank page
+
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]): Check for nil renderer.
+
 2002-10-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3075032 -- textarea contents sometimes aren't shown
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6f462d7..e090d6a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
+
+        * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
+	Roll back the parent call to use NodeBaseImpl::attach. Not sure why I changed that
+	at the last minute before my last checkin, but it was *bad*.
+
+	- fixed a crash I observed when clicking on an about:blank page
+
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]): Check for nil renderer.
+
 2002-10-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3075032 -- textarea contents sometimes aren't shown
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 6ec50e1..7dd7654 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -564,7 +564,7 @@ void HTMLGenericFormElementImpl::attach()
         parentNode()->renderer()->addChild(m_render, nextRenderer());
     }
 
-    HTMLElementImpl::attach();
+    NodeBaseImpl::attach();
 
     // The call to updateFromElement() needs to go after the call through
     // to the base class's attach() because that can sometimes do a close
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index b3a7478..6ed71fe 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -430,8 +430,12 @@ using khtml::RenderPart;
 
 - (NSDictionary *)elementAtPoint:(NSPoint)point
 {
+    RenderObject *renderer = part->impl->renderer();
+    if (!renderer) {
+        return nil;
+    }
     RenderObject::NodeInfo nodeInfo(true, true);
-    part->impl->renderer()->layer()->nodeAtPoint(nodeInfo, (int)point.x, (int)point.y);
+    renderer->layer()->nodeAtPoint(nodeInfo, (int)point.x, (int)point.y);
     
     NSMutableDictionary *elementInfo = [NSMutableDictionary dictionary];
 

-- 
WebKit Debian packaging