← Back to branch summary

~ubuntu-branches/ubuntu/lucid/seamonkey/lucid-security

« back to all changes in this revision

Viewing changes to layout/tables/nsTableRowGroupFrame.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2008-07-29 21:29:02 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729212902-spm9kpvchp9udwbw
Tags: 1.1.11+nobinonly-0ubuntu1
https://launchpad.net/bugs/218534
* New security upstream release: 1.1.11 (LP: #218534)
  Fixes USN-602-1, USN-619-1, USN-623-1 and USN-629-1
* Refresh diverged patch:
  - update debian/patches/80_security_build.patch
* Fix FTBFS with missing -lfontconfig
  - add debian/patches/11_fix_ftbfs_with_fontconfig.patch
  - update debian/patches/series
* Build with default gcc (hardy: 4.2, intrepid: 4.3)
  - update debian/rules
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
layout/tables/nsTableRowGroupFrame.cpp
1310
1310
    // calculate the height based on the rect of the last row
1311
1311
    aDesiredSize.height = GetHeightOfRows();
1312
1312
  }
1313
 
 
 
1313
  // if we have a nextinflow we are not complete
 
1314
  if (GetNextInFlow()) {
 
1315
    aStatus |= NS_FRAME_NOT_COMPLETE;
 
1316
  }
1314
1317
  aDesiredSize.mOverflowArea.UnionRect(aDesiredSize.mOverflowArea, nsRect(0, 0, aDesiredSize.width,
1315
1318
                                                                              aDesiredSize.height)); 
1316
1319
  FinishAndStoreOverflow(&aDesiredSize);
1503
1506
      break;
1504
1507
  }
1505
1508
 
1506
 
  // XXX If we have a next-in-flow, then we're not complete
1507
 
  if (mNextInFlow) {
1508
 
    aStatus = NS_FRAME_NOT_COMPLETE;
1509
 
  }
1510
1509
  return rv;
1511
1510
}
1512
1511
 
1739
1738
  // Return our desired width
1740
1739
  //aDesiredSize.width = aReflowState.reflowState.availableWidth;
1741
1740
 
1742
 
  if (mNextInFlow) {
1743
 
    aStatus = NS_FRAME_NOT_COMPLETE;
1744
 
  }
1745
 
 
1746
1741
  return rv;
1747
1742
}
1748
1743