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

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

Issue 343663004: Floats following inlines break to next line unncessarily (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 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 | Annotate | Revision Log
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 22 matching lines...) Expand all
33 #include "platform/LayoutUnit.h" 33 #include "platform/LayoutUnit.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 class FloatingObject; 37 class FloatingObject;
38 class RenderObject; 38 class RenderObject;
39 class RenderRubyRun; 39 class RenderRubyRun;
40 class RenderBlockFlow; 40 class RenderBlockFlow;
41 41
42 enum IndentTextOrNot { DoNotIndentText, IndentText }; 42 enum IndentTextOrNot { DoNotIndentText, IndentText };
43 enum WhitespaceTreatment { ExcludeWhitespace, IncludeWhitespace };
43 44
44 class LineWidth { 45 class LineWidth {
45 public: 46 public:
46 LineWidth(RenderBlockFlow&, bool isFirstLine, IndentTextOrNot shouldIndentTe xt); 47 LineWidth(RenderBlockFlow&, bool isFirstLine, IndentTextOrNot shouldIndentTe xt);
47 48
48 bool fitsOnLine() const { return currentWidth() <= (m_availableWidth + Layou tUnit::epsilon()); } 49 bool fitsOnLine() const { return currentWidth() <= (m_availableWidth + Layou tUnit::epsilon()); }
49 bool fitsOnLine(float extra) const { return currentWidth() + extra <= (m_ava ilableWidth + LayoutUnit::epsilon()); } 50 bool fitsOnLine(float extra) const { return currentWidth() + extra <= (m_ava ilableWidth + LayoutUnit::epsilon()); }
51 bool fitsOnLine(float extra, WhitespaceTreatment whitespaceTreatment) const
52 {
53 return currentWidth() - (whitespaceTreatment == ExcludeWhitespace ? trai lingWhitespaceWidth() : 0) + extra <= (m_availableWidth + LayoutUnit::epsilon()) ;
54 }
50 55
51 float currentWidth() const { return m_committedWidth + m_uncommittedWidth; } 56 float currentWidth() const { return m_committedWidth + m_uncommittedWidth; }
52 // 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.
53 float uncommittedWidth() const { return m_uncommittedWidth; } 58 float uncommittedWidth() const { return m_uncommittedWidth; }
54 float committedWidth() const { return m_committedWidth; } 59 float committedWidth() const { return m_committedWidth; }
55 float availableWidth() const { return m_availableWidth; } 60 float availableWidth() const { return m_availableWidth; }
61 float trailingWhitespaceWidth() const { return m_trailingWhitespaceWidth; }
56 62
57 void updateAvailableWidth(LayoutUnit minimumHeight = 0); 63 void updateAvailableWidth(LayoutUnit minimumHeight = 0);
58 void shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject*); 64 void shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject*);
59 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; } 65 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; }
60 void commit(); 66 void commit();
61 void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject * endRenderer); 67 void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject * endRenderer);
62 void fitBelowFloats(bool isFirstLine = false); 68 void fitBelowFloats(bool isFirstLine = false);
69 void setTrailingWhitespaceWidth(float width) { m_trailingWhitespaceWidth = w idth; }
63 70
64 bool shouldIndentText() const { return m_shouldIndentText == IndentText; } 71 bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
65 72
66 private: 73 private:
67 void computeAvailableWidthFromLeftAndRight(); 74 void computeAvailableWidthFromLeftAndRight();
68 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);
69 void wrapNextToShapeOutside(bool isFirstLine); 76 void wrapNextToShapeOutside(bool isFirstLine);
70 77
71 RenderBlockFlow& m_block; 78 RenderBlockFlow& m_block;
72 float m_uncommittedWidth; 79 float m_uncommittedWidth;
73 float m_committedWidth; 80 float m_committedWidth;
74 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;
75 float m_left; 83 float m_left;
76 float m_right; 84 float m_right;
77 float m_availableWidth; 85 float m_availableWidth;
78 bool m_isFirstLine; 86 bool m_isFirstLine;
79 IndentTextOrNot m_shouldIndentText; 87 IndentTextOrNot m_shouldIndentText;
80 }; 88 };
81 89
82 } 90 }
83 91
84 #endif // LineWidth_h 92 #endif // LineWidth_h
OLDNEW
« no previous file with comments | « Source/core/rendering/line/BreakingContextInlineHeaders.h ('k') | Source/core/rendering/line/LineWidth.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698