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

Timestamp:

05/12/06 17:54:02 (3 years ago)

Author:

eseidel

Message:

2006-05-12 Eric Seidel <eseidel@apple.com>

Reviewed by beth.

Split out render_line.* into separate files (one per class).

• WebCore.xcodeproj/project.pbxproj:
• dom/ContainerNode.cpp:
• rendering/EllipsisBox.cpp: Added.
• rendering/EllipsisBox.h: Added. (WebCore::EllipsisBox::EllipsisBox):
• rendering/InlineBox.cpp: Added.
• rendering/InlineBox.h: Added. (WebCore::InlineBox::InlineBox): (WebCore::InlineBox::~InlineBox): (WebCore::InlineBox::bottomOverflow): (WebCore::InlineBox::rightOverflow):
• rendering/InlineFlowBox.cpp: Added. (WebCore::InlineFlowBox::placeBoxesHorizontally):
• rendering/InlineFlowBox.h: Added.
• rendering/InlineRunBox.h: Added. (WebCore::InlineRunBox::InlineRunBox): (WebCore::InlineRunBox::paintBackgroundAndBorder): (WebCore::InlineRunBox::paintDecorations):
• rendering/InlineTextBox.h:
• rendering/RenderBlock.h:
• rendering/RenderFlow.h:
• rendering/RenderReplaced.cpp:
• rendering/RootInlineBox.cpp: Added.
• rendering/RootInlineBox.h: Added. (WebCore::RootInlineBox::RootInlineBox):
• rendering/render_line.h: Removed.

Files:

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

trunk/WebCore/rendering/RenderBlock.h

@@ -27 +27 @@
 #include "GapRects.h"
 #include "RenderFlow.h"
+#include "RootInlineBox.h"
 
 namespace WebCore {
 
 class Position;
+class RootInlineBox;
 
 enum CaretType {
@@ -103 +105 @@
 
     virtual void addChildToFlow(RenderObject* newChild, RenderObject* beforeChild);
-    virtual void removeChild(RenderObject *oldChild);
+    virtual void removeChild(RenderObject*);
 
     virtual void repaintObjectsBeforeLayout();
@@ -109 +111 @@
     virtual void getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds);
 
-    virtual void setStyle(RenderStyle* _style);
+    virtual void setStyle(RenderStyle*);
 
     virtual void layout();
@@ -126 +128 @@
     
     // the implementation of the following functions is in bidi.cpp
-    void bidiReorderLine(const BidiIterator &start, const BidiIterator &end, BidiState &bidi );
-    RootInlineBox* determineStartPosition(bool fullLayout, BidiIterator &start, BidiState &bidi);
+    void bidiReorderLine(const BidiIterator& start, const BidiIterator& end, BidiState &bidi );
+    RootInlineBox* determineStartPosition(bool fullLayout, BidiIterator& start, BidiState &bidi);
     RootInlineBox* determineEndPosition(RootInlineBox* startBox, BidiIterator& cleanLineStart,
                                         BidiStatus& cleanLineBidiStatus, BidiContext*& cleanLineBidiContext,
@@ -134 +136 @@
                         const BidiIterator& endLineStart, const BidiStatus& endLineStatus,
                         BidiContext* endLineContext, RootInlineBox*& endLine, int& endYPos);
-    int skipWhitespace(BidiIterator &, BidiState &);
-    BidiIterator findNextLineBreak(BidiIterator &start, BidiState &info );
+    int skipWhitespace(BidiIterator& , BidiState &);
+    BidiIterator findNextLineBreak(BidiIterator& start, BidiState &info );
     RootInlineBox* constructLine(const BidiIterator& start, const BidiIterator& end);
     InlineFlowBox* createLineBoxes(RenderObject* obj);