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

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

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Zoltan's comments Created 6 years, 9 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 float committedWidth() const { return m_committedWidth; } 57 float committedWidth() const { return m_committedWidth; }
58 float availableWidth() const { return m_availableWidth; } 58 float availableWidth() const { return m_availableWidth; }
59 59
60 void updateAvailableWidth(LayoutUnit minimumHeight = 0); 60 void updateAvailableWidth(LayoutUnit minimumHeight = 0);
61 void shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject*); 61 void shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject*);
62 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; } 62 void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; }
63 void commit(); 63 void commit();
64 void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject * endRenderer); 64 void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject * endRenderer);
65 void fitBelowFloats(bool isFirstLine = false); 65 void fitBelowFloats(bool isFirstLine = false);
66 66
67 void updateCurrentShapeSegment();
68
69 bool shouldIndentText() const { return m_shouldIndentText == IndentText; } 67 bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
70 68
71 private: 69 private:
72 void computeAvailableWidthFromLeftAndRight(); 70 void computeAvailableWidthFromLeftAndRight();
73 void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, con st float& newLineLeft, const float& newLineRight); 71 void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, con st float& newLineLeft, const float& newLineRight);
74 void wrapNextToShapeOutside(bool isFirstLine); 72 void wrapNextToShapeOutside(bool isFirstLine);
75 73
76 RenderBlockFlow& m_block; 74 RenderBlockFlow& m_block;
77 float m_uncommittedWidth; 75 float m_uncommittedWidth;
78 float m_committedWidth; 76 float m_committedWidth;
79 float m_overhangWidth; // The amount by which |m_availableWidth| has been in flated to account for possible contraction due to ruby overhang. 77 float m_overhangWidth; // The amount by which |m_availableWidth| has been in flated to account for possible contraction due to ruby overhang.
80 float m_left; 78 float m_left;
81 float m_right; 79 float m_right;
82 float m_availableWidth; 80 float m_availableWidth;
83 const LineSegment* m_segment;
84 bool m_isFirstLine; 81 bool m_isFirstLine;
85 IndentTextOrNot m_shouldIndentText; 82 IndentTextOrNot m_shouldIndentText;
86 }; 83 };
87 84
88 } 85 }
89 86
90 #endif // LineWidth_h 87 #endif // LineWidth_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698