Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: Source/core/layout/line/LineWidth.h

Issue 763173003: Convert RenderBlockFlow code to use FloatingObject references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/layout/line/LineBreaker.cpp ('k') | Source/core/layout/line/LineWidth.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 float currentWidth() const { return m_committedWidth + m_uncommittedWidth; } 56 float currentWidth() const { return m_committedWidth + m_uncommittedWidth; }
57 // FIXME: We should eventually replace these three functions by ones that wo rk on a higher abstraction. 57 // FIXME: We should eventually replace these three functions by ones that wo rk on a higher abstraction.
58 float uncommittedWidth() const { return m_uncommittedWidth; } 58 float uncommittedWidth() const { return m_uncommittedWidth; }
59 float committedWidth() const { return m_committedWidth; } 59 float committedWidth() const { return m_committedWidth; }
60 float availableWidth() const { return m_availableWidth; } 60 float availableWidth() const { return m_availableWidth; }
61 float trailingWhitespaceWidth() const { return m_trailingWhitespaceWidth; } 61 float trailingWhitespaceWidth() const { return m_trailingWhitespaceWidth; }
62 62
63 void updateAvailableWidth(LayoutUnit minimumHeight = 0); 63 void updateAvailableWidth(LayoutUnit minimumHeight = 0);
64 void shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject*); 64 void shrinkAvailableWidthForNewFloatIfNeeded(const FloatingObject&);
65 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; } 65 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; }
66 void commit(); 66 void commit();
67 void applyOverhang(LayoutRubyRun*, LayoutObject* startLayoutObject, LayoutOb ject* endLayoutObject); 67 void applyOverhang(LayoutRubyRun*, LayoutObject* startLayoutObject, LayoutOb ject* endLayoutObject);
68 void fitBelowFloats(bool isFirstLine = false); 68 void fitBelowFloats(bool isFirstLine = false);
69 void setTrailingWhitespaceWidth(float width) { m_trailingWhitespaceWidth = w idth; } 69 void setTrailingWhitespaceWidth(float width) { m_trailingWhitespaceWidth = w idth; }
70 70
71 bool shouldIndentText() const { return m_shouldIndentText == IndentText; } 71 bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
72 72
73 private: 73 private:
74 void computeAvailableWidthFromLeftAndRight(); 74 void computeAvailableWidthFromLeftAndRight();
75 void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, con st float& newLineLeft, const float& newLineRight); 75 void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, con st float& newLineLeft, const float& newLineRight);
76 void wrapNextToShapeOutside(bool isFirstLine); 76 void wrapNextToShapeOutside(bool isFirstLine);
77 77
78 LayoutBlockFlow& m_block; 78 LayoutBlockFlow& m_block;
79 float m_uncommittedWidth; 79 float m_uncommittedWidth;
80 float m_committedWidth; 80 float m_committedWidth;
81 float m_overhangWidth; // The amount by which |m_availableWidth| has been in flated to account for possible contraction due to ruby overhang. 81 float m_overhangWidth; // The amount by which |m_availableWidth| has been in flated to account for possible contraction due to ruby overhang.
82 float m_trailingWhitespaceWidth; 82 float m_trailingWhitespaceWidth;
83 float m_left; 83 float m_left;
84 float m_right; 84 float m_right;
85 float m_availableWidth; 85 float m_availableWidth;
86 bool m_isFirstLine; 86 bool m_isFirstLine;
87 IndentTextOrNot m_shouldIndentText; 87 IndentTextOrNot m_shouldIndentText;
88 }; 88 };
89 89
90 } 90 }
91 91
92 #endif // LineWidth_h 92 #endif // LineWidth_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/LineBreaker.cpp ('k') | Source/core/layout/line/LineWidth.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698