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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 85241616b4a0136678bfa0230fdb61a45fa31877
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 08:03:52 2002 +0000

    	Fix bayarea.com.  My implementation of offsetParent was
    	flawed.  And to think I was blaming Gecko... ;)
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::offsetParent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 038c557..c4f386f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-10-17  David Hyatt  <hyatt at apple.com>
+
+	Fix bayarea.com.  My implementation of offsetParent was
+	flawed.  And to think I was blaming Gecko... ;)
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::offsetParent):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 038c557..c4f386f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-10-17  David Hyatt  <hyatt at apple.com>
+
+	Fix bayarea.com.  My implementation of offsetParent was
+	flawed.  And to think I was blaming Gecko... ;)
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::offsetParent):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 038c557..c4f386f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-10-17  David Hyatt  <hyatt at apple.com>
+
+	Fix bayarea.com.  My implementation of offsetParent was
+	flawed.  And to think I was blaming Gecko... ;)
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::offsetParent):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3061103 -- Line-breaks lost when submitting after pasting text from
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 19379f1..65c40b5 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -198,11 +198,14 @@ int RenderObject::offsetTop() const
     
 RenderObject* RenderObject::offsetParent() const
 {
+    bool skipTables = isPositioned() || isRelPositioned();
     RenderObject* curr = parent();
-    while (curr && !curr->isTableCell() && !curr->isTable() &&
-           !curr->isPositioned() && !curr->isRelPositioned() &&
-           !curr->isBody())
+    while (curr && !curr->isPositioned() && !curr->isRelPositioned() &&
+           !curr->isBody()) {
+        if (!skipTables && (curr->isTableCell() || curr->isTable()))
+            break;
         curr = curr->parent();
+    }
     return curr;
 }
 

-- 
WebKit Debian packaging