| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * Copyright (C) 2013 Google Inc. All rights reserved. | 7 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * Redistribution and use in source and binary forms, with or without | 9 * Redistribution and use in source and binary forms, with or without |
| 10 * modification, are permitted provided that the following conditions are | 10 * modification, are permitted provided that the following conditions are |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 | 299 |
| 300 friend class MarginInfo; | 300 friend class MarginInfo; |
| 301 friend class LineBreaker; | 301 friend class LineBreaker; |
| 302 friend class LineWidth; // needs to know FloatingObject | 302 friend class LineWidth; // needs to know FloatingObject |
| 303 | 303 |
| 304 // FIXME-BLOCKFLOW: These methods have implementations in | 304 // FIXME-BLOCKFLOW: These methods have implementations in |
| 305 // RenderBlockLineLayout. They should be moved to the proper header once the | 305 // RenderBlockLineLayout. They should be moved to the proper header once the |
| 306 // line layout code is separated from RenderBlock and RenderBlockFlow. | 306 // line layout code is separated from RenderBlock and RenderBlockFlow. |
| 307 // START METHODS DEFINED IN RenderBlockLineLayout | 307 // START METHODS DEFINED IN RenderBlockLineLayout |
| 308 public: | 308 public: |
| 309 static void appendRunsForObject(BidiRunList<BidiRun>&, int start, int end, R
enderObject*, InlineBidiResolver&); | 309 static void appendRunsForObject(int start, int end, RenderObject*, InlineBid
iResolver&); |
| 310 | 310 |
| 311 private: | 311 private: |
| 312 InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* ch
ildBox, bool startsNewSegment); | 312 InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* ch
ildBox, bool startsNewSegment); |
| 313 RootInlineBox* constructLine(BidiRunList<BidiRun>&, const LineInfo&); | 313 RootInlineBox* constructLine(BidiRunList<BidiRun>&, const LineInfo&); |
| 314 void setMarginsForRubyRun(BidiRun*, RenderRubyRun*, RenderObject*, const Lin
eInfo&); | 314 void setMarginsForRubyRun(BidiRun*, RenderRubyRun*, RenderObject*, const Lin
eInfo&); |
| 315 void computeInlineDirectionPositionsForLine(RootInlineBox*, const LineInfo&,
BidiRun* firstRun, BidiRun* trailingSpaceRun, bool reachedEnd, GlyphOverflowAnd
FallbackFontsMap&, VerticalPositionCache&, WordMeasurements&); | 315 void computeInlineDirectionPositionsForLine(RootInlineBox*, const LineInfo&,
BidiRun* firstRun, BidiRun* trailingSpaceRun, bool reachedEnd, GlyphOverflowAnd
FallbackFontsMap&, VerticalPositionCache&, WordMeasurements&); |
| 316 BidiRun* computeInlineDirectionPositionsForSegment(RootInlineBox*, const Lin
eInfo&, ETextAlign, float& logicalLeft, | 316 BidiRun* computeInlineDirectionPositionsForSegment(RootInlineBox*, const Lin
eInfo&, ETextAlign, float& logicalLeft, |
| 317 float& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingSpaceR
un, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache&, Wo
rdMeasurements&); | 317 float& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingSpaceR
un, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache&, Wo
rdMeasurements&); |
| 318 void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv
erflowAndFallbackFontsMap&, VerticalPositionCache&); | 318 void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv
erflowAndFallbackFontsMap&, VerticalPositionCache&); |
| 319 BidiRun* handleTrailingSpaces(BidiRunList<BidiRun>&, BidiContext*); | 319 BidiRun* handleTrailingSpaces(BidiRunList<BidiRun>&, BidiContext*); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 342 | 342 |
| 343 // END METHODS DEFINED IN RenderBlockLineLayout | 343 // END METHODS DEFINED IN RenderBlockLineLayout |
| 344 | 344 |
| 345 }; | 345 }; |
| 346 | 346 |
| 347 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 347 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 348 | 348 |
| 349 } // namespace WebCore | 349 } // namespace WebCore |
| 350 | 350 |
| 351 #endif // RenderBlockFlow_h | 351 #endif // RenderBlockFlow_h |
| OLD | NEW |