| 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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 457     friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
     itionNewFloatOnLine, if we move those out from the private scope/add a helper to
      LineBreaker, we can remove this friend | 457     friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
     itionNewFloatOnLine, if we move those out from the private scope/add a helper to
      LineBreaker, we can remove this friend | 
| 458     friend class MarginInfo; | 458     friend class MarginInfo; | 
| 459     friend class LineBreaker; | 459     friend class LineBreaker; | 
| 460     friend class LineWidth; // needs to know FloatingObject | 460     friend class LineWidth; // needs to know FloatingObject | 
| 461 | 461 | 
| 462 // FIXME-BLOCKFLOW: These methods have implementations in | 462 // FIXME-BLOCKFLOW: These methods have implementations in | 
| 463 // RenderBlockLineLayout. They should be moved to the proper header once the | 463 // RenderBlockLineLayout. They should be moved to the proper header once the | 
| 464 // line layout code is separated from RenderBlock and RenderBlockFlow. | 464 // line layout code is separated from RenderBlock and RenderBlockFlow. | 
| 465 // START METHODS DEFINED IN RenderBlockLineLayout | 465 // START METHODS DEFINED IN RenderBlockLineLayout | 
| 466 private: | 466 private: | 
| 467     InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* ch
     ildBox, bool startsNewSegment); | 467     InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* ch
     ildBox); | 
| 468     RootInlineBox* constructLine(BidiRunList<BidiRun>&, const LineInfo&); | 468     RootInlineBox* constructLine(BidiRunList<BidiRun>&, const LineInfo&); | 
| 469     void setMarginsForRubyRun(BidiRun*, RenderRubyRun*, RenderObject*, const Lin
     eInfo&); | 469     void setMarginsForRubyRun(BidiRun*, RenderRubyRun*, RenderObject*, const Lin
     eInfo&); | 
| 470     void computeInlineDirectionPositionsForLine(RootInlineBox*, const LineInfo&,
      BidiRun* firstRun, BidiRun* trailingSpaceRun, bool reachedEnd, GlyphOverflowAnd
     FallbackFontsMap&, VerticalPositionCache&, WordMeasurements&); | 470     void computeInlineDirectionPositionsForLine(RootInlineBox*, const LineInfo&,
      BidiRun* firstRun, BidiRun* trailingSpaceRun, bool reachedEnd, GlyphOverflowAnd
     FallbackFontsMap&, VerticalPositionCache&, WordMeasurements&); | 
| 471     BidiRun* computeInlineDirectionPositionsForSegment(RootInlineBox*, const Lin
     eInfo&, ETextAlign, float& logicalLeft, | 471     BidiRun* computeInlineDirectionPositionsForSegment(RootInlineBox*, const Lin
     eInfo&, ETextAlign, float& logicalLeft, | 
| 472         float& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingSpaceR
     un, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache&, Wo
     rdMeasurements&); | 472         float& availableLogicalWidth, BidiRun* firstRun, BidiRun* trailingSpaceR
     un, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache&, Wo
     rdMeasurements&); | 
| 473     void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv
     erflowAndFallbackFontsMap&, VerticalPositionCache&); | 473     void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOv
     erflowAndFallbackFontsMap&, VerticalPositionCache&); | 
| 474     BidiRun* handleTrailingSpaces(BidiRunList<BidiRun>&, BidiContext*); | 474     BidiRun* handleTrailingSpaces(BidiRunList<BidiRun>&, BidiContext*); | 
| 475     void appendFloatingObjectToLastLine(FloatingObject*); | 475     void appendFloatingObjectToLastLine(FloatingObject*); | 
| 476     // Helper function for layoutInlineChildren() | 476     // Helper function for layoutInlineChildren() | 
| 477     RootInlineBox* createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<B
     idiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun*
      trailingSpaceRun, WordMeasurements&); | 477     RootInlineBox* createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<B
     idiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun*
      trailingSpaceRun, WordMeasurements&); | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 494 | 494 | 
| 495 // END METHODS DEFINED IN RenderBlockLineLayout | 495 // END METHODS DEFINED IN RenderBlockLineLayout | 
| 496 | 496 | 
| 497 }; | 497 }; | 
| 498 | 498 | 
| 499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 
| 500 | 500 | 
| 501 } // namespace WebCore | 501 } // namespace WebCore | 
| 502 | 502 | 
| 503 #endif // RenderBlockFlow_h | 503 #endif // RenderBlockFlow_h | 
| OLD | NEW | 
|---|