Changeset 19586 for S60/trunk/WebCore

Timestamp:

02/12/07 15:35:48 (2 years ago)

Author:

brmorris

Message:

zalan, Reviewed by yongjun.

DESC: merging WebKit/trunk r16319 to s60/trunk PKAI-6Y2PBN
Fix fieldsets so that they properly expand to enclose overhanging floats
when the fieldset has auto height. This is a nifty undocumented behavior
of the fieldset element. See http://bugs.webkit.org/show_bug.cgi?id=3898

http://bugs.webkit.org/show_bug.cgi?id=12748

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/rendering/render_block.cpp (modified) (1 diff)
• khtml/rendering/render_form.h (modified) (1 diff)
• khtml/rendering/render_object.h (modified) (1 diff)
• khtml/rendering/render_table.h (modified) (6 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+zalan, Reviewed by yongjun.
+        DESC: merging WebKit/trunk r16319 to s60/trunk PKAI-6Y2PBN  
+        Fix fieldsets so that they properly expand to enclose overhanging floats
+        when the fieldset has auto height.  This is a nifty undocumented behavior
+        of the fieldset element. See http://bugs.webkit.org/show_bug.cgi?id=3898
+
+        http://bugs.webkit.org/show_bug.cgi?id=12748
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::layoutBlock):
+        * khtml/rendering/render_form.h:
+        (khtml::RenderFieldset::expandsToEncloseOverhangingFloats):
+        * khtml/rendering/render_object.h:
+        (khtml::RenderObject::expandsToEncloseOverhangingFloats):
+        * khtml/rendering/render_table.h:
+        (khtml::RenderTableCell::expandsToEncloseOverhangingFloats):
+
 yaharon, reviewed by zalan
  DESC: [S60] Browser crashes when selecting the left Soft key Options when the cursor is in textarea field (SCHY-6Y7SHD)

S60/trunk/WebCore/khtml/rendering/render_block.cpp

@@ -543 +543 @@
     }
 
-    if (hasOverhangingFloats() && ((isFloating() && style()->height().isVariable()) || isTableCell())) {
+    // Some classes of objects (floats and fieldsets with no specified heights and table cells) expand to encompass
+    // overhanging floats.
+    if (hasOverhangingFloats() && expandsToEncloseOverhangingFloats()) {
         m_height = floatBottom();
         m_height += borderBottom() + paddingBottom();

S60/trunk/WebCore/khtml/rendering/render_form.h

@@ -311 +311 @@
 
     virtual RenderObject* layoutLegend(bool relayoutChildren);
+    virtual bool expandsToEncloseOverhangingFloats() const { return style()->height().isVariable(); }
 
     virtual void setStyle(RenderStyle* _style);

S60/trunk/WebCore/khtml/rendering/render_object.h

@@ -764 +764 @@
     virtual bool containsFloat(RenderObject* o) { return false; }
     virtual bool hasOverhangingFloats() { return false; }
+    virtual bool expandsToEncloseOverhangingFloats() const { return isFloating() && style()->height().isVariable(); }
     virtual QRect floatRect() const { return borderBox(); }
 

S60/trunk/WebCore/khtml/rendering/render_table.h

@@ -111 +111 @@
 
 #ifdef NOKIA_CHANGES
-        virtual void getRenderersInRect(QPtrList<BoxInfo>& boxInfoList,int deltaX,int deltaY,const QRect& rect);
+    virtual void getRenderersInRect(QPtrList<BoxInfo>& boxInfoList,int deltaX,int deltaY,const QRect& rect);
 #endif
     virtual RenderBlock* firstLineBlock() const;
@@ -124 +124 @@
 #endif
     struct ColumnStruct {
-        enum {
-            WidthUndefined = 0xffff
-        };
-        ColumnStruct() {
-            span = 1;
-            width = WidthUndefined;
-        }
-        ushort span;
-        uint width; // the calculated position of the column
+    enum {
+        WidthUndefined = 0xffff
+    };
+    ColumnStruct() {
+        span = 1;
+        width = WidthUndefined;
+    }
+    ushort span;
+    uint width; // the calculated position of the column
     };
 
@@ -143 +143 @@
     int spanOfEffCol( int effCol ) const { return columns[effCol].span; }
     int colToEffCol( int col ) const {
-        int c = 0;
-        int i = 0;
-        while ( c < col && i < (int)columns.size() ) {
-            c += columns[i].span;
-            i++;
-        }
-        return i;
+    int c = 0;
+    int i = 0;
+    while ( c < col && i < (int)columns.size() ) {
+        c += columns[i].span;
+        i++;
+    }
+    return i;
     }
     int effColToCol( int effCol ) const {
-        int c = 0;
-        for ( int i = 0; i < effCol; i++ )
-            c += columns[i].span;
-        return c;
+    int c = 0;
+    for ( int i = 0; i < effCol; i++ )
+        c += columns[i].span;
+    return c;
     }
 
     int bordersPaddingAndSpacing() const {
-        return borderLeft() + borderRight() + 
+    return borderLeft() + borderRight() + 
                (collapseBorders() ? 0 : (paddingLeft() + paddingRight() + (numEffCols()+1) * hBorderSpacing()));
     }
@@ -197 +197 @@
     Rules rules                 : 4;
 
-    bool has_col_elems          : 1;
-    uint padding                : 22;
-    uint needSectionRecalc      : 1;
+    bool has_col_elems      : 1;
+    uint padding        : 22;
+    uint needSectionRecalc  : 1;
     
     short hspacing;
@@ -246 +246 @@
     typedef QMemArray<CellStruct> Row;
     struct RowStruct {
-        Row *row;
-        int baseLine;
-        Length height;
+    Row *row;
+    int baseLine;
+    Length height;
     };
 
     CellStruct& cellAt(int row,  int col) {
-        return (*grid[row].row)[col];
+    return (*grid[row].row)[col];
     }
     const CellStruct& cellAt(int row, int col) const {
-        return (*grid[row].row)[col];
+    return (*grid[row].row)[col];
     }
 
@@ -353 +353 @@
     virtual void setWidth( int width );
     virtual void setStyle( RenderStyle *style );
+    virtual bool expandsToEncloseOverhangingFloats() const { return true; }
 
     int borderLeft() const;