[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-09-26 21:44:09
Message-ID: 1127771049.825672.13433.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 464316 by ggarand:

try harder to make offsetParent's strict behaviour
match MSIE's. My previous attempt was quite wrong.

BUG: 113280



 M  +3 -7      render_object.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_object.cpp #464315:464316
@@ -438,15 +438,11 @@
 
 RenderObject* RenderObject::offsetParent() const
 {
-    if (!style()->htmlHacks()) {
-        // match IE in strict mode
-        if (isRoot()||isBody())
-            return 0;
-        return containingBlock();
-    }
     bool skipTables = isPositioned() || isRelPositioned();
+    bool strict = !style()->htmlHacks();
     RenderObject* curr = parent();
-    while (curr && !curr->isPositioned() && !curr->isRelPositioned() && !curr->isBody()) {
+    while (curr && !curr->isPositioned() && !curr->isRelPositioned() && 
+                   !(strict && skipTables ? curr->isRoot() : curr->isBody())) {
         if (!skipTables && (curr->isTableCell() || curr->isTable()))
             break;
         curr = curr->parent();
[prev in list] [next in list] [prev in thread] [next in thread]