Changeset 18762 for trunk/WebCore/rendering/RenderBlock.h

Timestamp:

01/11/07 04:21:22 (2 years ago)

Author:

hyatt

Message:

Fix two bugs in positionForCoordinates. (Make it work when you have a margin in between your border and
your first child block.)

Rewrite column rebalancing to have two modes: constrained and unconstrained. In unconstrained mode,
the system will dynamically rebalance as it loses space to breaks and compute a final intrinsic height
for the overall block. In constrained mode, columns flow into the fixed height block, and extra columns
spill out horizontally in the appropriate direction (RTL/LTR).

Make columns work properly with both LTR and RTL overflow blocks.

Initial column test suite coming soon now that the basic layout is right.

Reviewed by darin

• rendering/RenderBlock.cpp: (WebCore:::RenderFlow): (WebCore::RenderBlock::layoutBlock): (WebCore::RenderBlock::paintColumns): (WebCore::RenderBlock::lowestPosition): (WebCore::RenderBlock::rightmostPosition): (WebCore::RenderBlock::leftmostPosition): (WebCore::RenderBlock::hitTestColumns): (WebCore::RenderBlock::positionForCoordinates): (WebCore::RenderBlock::availableWidth): (WebCore::RenderBlock::calcColumnWidth): (WebCore::RenderBlock::layoutColumns): (WebCore::RenderBlock::adjustPointToColumnContents):
• rendering/RenderBlock.h: (WebCore::RenderBlock::hasColumns):

Files:

• trunk/WebCore/rendering/RenderBlock.h (modified) (3 diffs)

trunk/WebCore/rendering/RenderBlock.h

@@ -281 +281 @@
     void clearTruncation();
 
-    virtual bool hasColumns() const { return m_columnCount > 1; }
+    virtual bool hasColumns() const { return m_desiredColumnCount > 1; }
     void adjustRectForColumns(IntRect&) const;
 private:
@@ -296 +296 @@
     int columnGap() const;
     void calcColumnWidth();
-    void layoutColumns();
+    int layoutColumns(int endOfContent = -1);
 
 protected:
@@ -462 +462 @@
     
     // Column information.
-    int m_columnWidth;
-    unsigned m_columnCount;
+    int m_desiredColumnWidth;
+    unsigned m_desiredColumnCount;
     Vector<IntRect>* m_columnRects;
 };