Commit 06795487 authored by rniwa@webkit.org's avatar rniwa@webkit.org

2011-04-06 Ryosuke Niwa <rniwa@webkit.org>

        Moved the declaration of positionNewFloatOnLine in RenderBlock.h after r83042.

        * rendering/RenderBlock.h:


git-svn-id: svn://svn.chromium.org/blink/trunk@83052 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 4e507343
2011-04-06 Ryosuke Niwa <rniwa@webkit.org>
Moved the declaration of positionNewFloatOnLine in RenderBlock.h after r83042.
* rendering/RenderBlock.h:
2011-03-27 Diego Gonzalez <diegohcg@webkit.org>
Reviewed by Kenneth Rohde Christiansen.
......@@ -505,6 +505,11 @@ private:
void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOverflowAndFallbackFontsMap&, VerticalPositionCache&);
void deleteEllipsisLineBoxes();
void checkLinesForTextOverflow();
// Positions new floats and also adjust all floats encountered on the line if any of them
// have to move to the next page/column.
bool positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, bool firstLine, int& lineLeftOffset, int& lineRightOffset);
// End of functions defined in RenderBlockLineLayout.cpp.
void paintFloats(PaintInfo&, int tx, int ty, bool preservePhase = false);
......@@ -523,10 +528,6 @@ private:
// Called from lineWidth, to position the floats added in the last line.
// Returns true if and only if it has positioned any floats.
bool positionNewFloats();
// Positions new floats and also adjust all floats encountered on the line if any of them
// have to move to the next page/column.
bool positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, bool firstLine, int& lineLeftOffset, int& lineRightOffset);
void clearFloats();
int getClearDelta(RenderBox* child, int yPos);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment