Changeset 11484 in webkit

Timestamp:

Dec 7, 2005 1:24:59 PM (18 years ago)

Author:

hyatt

Message:

Fix the DHTML menus on monster.com. offsetParent should only return RenderObjects that
have corresponding DOM elements.

Reviewed by Eric Seidel

• khtml/rendering/render_object.cpp: (RenderObject::offsetParent):

Location:

trunk/WebCore

Files:

• ChangeLog-2005-12-19 (modified) (1 diff)
• khtml/rendering/render_object.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog-2005-12-19

@@ +1 @@
+2005-12-07  David Hyatt  <hyatt@apple.com>
+
+        Fix the DHTML menus on monster.com.  offsetParent should only return RenderObjects that
+        have corresponding DOM elements.
+        
+        Reviewed by Eric Seidel
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::offsetParent):
+
 2005-12-07  Eric Seidel  <eseidel@apple.com>
 

trunk/WebCore/khtml/rendering/render_object.cpp

@@ -578 +578 @@
 RenderObject* RenderObject::offsetParent() const
 {
+    // FIXME: It feels like this function could almost be written using containing blocks.
     bool skipTables = isPositioned() || isRelPositioned();
     RenderObject* curr = parent();
-    while (curr && !curr->isPositioned() && !curr->isRelPositioned() &&
-           !curr->isBody()) {
-        if (!skipTables && (curr->isTableCell() || curr->isTable()))
+    while (curr && (!curr->element() || 
+                    (!curr->isPositioned() && !curr->isRelPositioned() && 
+                        !(!style()->htmlHacks() && skipTables ? curr->isRoot() : curr->isBody())))) {
+        if (!skipTables && curr->element() && (curr->isTableCell() || curr->isTable()))
             break;
         curr = curr->parent();