[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 e460f6e4b27726ef24f794601fba6632d93a6ea8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 18:35:52 2003 +0000

    	Patch from KHTML trunk.  Move frameset positioning reset into adjustRenderStyle so as not to
    	pollute the render tree.
    
            * khtml/css/cssstyleselector.cpp:
            (khtml::CSSStyleSelector::adjustRenderStyle):
            * khtml/rendering/render_box.cpp:
            (RenderBox::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 84dca23..f68dae0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-11-03  David Hyatt  <hyatt at apple.com>
 
+	Patch from KHTML trunk.  Move frameset positioning reset into adjustRenderStyle so as not to
+	pollute the render tree.
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::adjustRenderStyle):
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+
+2003-11-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3471609, 'transparent' should be an acceptable named color value instead of a special
 	keyword used only by background/border.
 	
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index b3ef938..9ab79c9 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -539,6 +539,11 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
                 style->setDisplay(style->isDisplayInlineType() ? INLINE_TABLE : TABLE);
         }
 
+        // Frames and framesets never honor position:relative or position:absolute.  This is necessary to
+        // fix a crash where a site tries to position these objects.
+        if (e && (e->id() == ID_FRAME || e->id() == ID_FRAMESET))
+            style->setPosition(STATIC);
+            
         // Mutate the display to BLOCK or TABLE for certain cases, e.g., if someone attempts to
         // position or float an inline, compact, or run-in.  Cache the original display, since it
         // may be needed for positioned elements that have to compute their static normal flow
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 4477fbe..bec65fd 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -90,13 +90,6 @@ void RenderBox::setStyle(RenderStyle *_style)
             setRelPositioned(true);
     }
 
-    // Frames and framesets never honor position:relative or position:absolute.  This is necessary to
-    // fix a crash where a site tries to position these objects.
-    if (element() && (element()->id() == ID_FRAME || element()->id() == ID_FRAMESET)) {
-        setPositioned(false);
-        setRelPositioned(false);
-    }
-    
     if (requiresLayer()) {
         if (!m_layer) {
             m_layer = new (renderArena()) RenderLayer(this);

-- 
WebKit Debian packaging