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

Unified Diff: Source/core/layout/api/LineLayoutBoxModel.h

Issue 1294483002: [Line Layout API] Convert InlineBox::boxModelObject to new API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: nits Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | Source/core/layout/api/LineLayoutItem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/api/LineLayoutBoxModel.h
diff --git a/Source/core/layout/api/LineLayoutBoxModel.h b/Source/core/layout/api/LineLayoutBoxModel.h
index 9d9bdd9cf57162ce51992ccff4c4fc744c432d60..be126265f1090362c41d3b71b077452cc2c6f85e 100644
--- a/Source/core/layout/api/LineLayoutBoxModel.h
+++ b/Source/core/layout/api/LineLayoutBoxModel.h
@@ -33,16 +33,106 @@ public:
return toBoxModel()->layer();
}
- LayoutUnit lineHeight(bool firstLine, LineDirectionMode lineDirectionMode, LinePositionMode linePositionMode) const
+ LayoutUnit lineHeight(bool firstLine, LineDirectionMode lineDirectionMode, LinePositionMode linePositionMode = PositionOnContainingLine) const
{
return toBoxModel()->lineHeight(firstLine, lineDirectionMode, linePositionMode);
}
- int baselinePosition(FontBaseline fontBaseline, bool firstLine, LineDirectionMode lineDirectionMode, LinePositionMode linePositionMode) const
+ int baselinePosition(FontBaseline fontBaseline, bool firstLine, LineDirectionMode lineDirectionMode, LinePositionMode linePositionMode = PositionOnContainingLine) const
{
return toBoxModel()->baselinePosition(fontBaseline, firstLine, lineDirectionMode, linePositionMode);
}
+ bool hasSelfPaintingLayer() const
+ {
+ return toBoxModel()->hasSelfPaintingLayer();
+ }
+
+ LayoutUnit marginTop() const
+ {
+ return toBoxModel()->marginTop();
+ }
+
+ LayoutUnit marginBottom() const
+ {
+ return toBoxModel()->marginBottom();
+ }
+
+ LayoutUnit marginLeft() const
+ {
+ return toBoxModel()->marginLeft();
+ }
+
+ LayoutUnit marginRight() const
+ {
+ return toBoxModel()->marginRight();
+ }
+
+ LayoutUnit marginBefore(const ComputedStyle* otherStyle = nullptr) const
+ {
+ return toBoxModel()->marginBefore(otherStyle);
+ }
+
+ LayoutUnit marginAfter(const ComputedStyle* otherStyle = nullptr) const
+ {
+ return toBoxModel()->marginAfter(otherStyle);
+ }
+
+ LayoutUnit paddingTop() const
+ {
+ return toBoxModel()->paddingTop();
+ }
+
+ LayoutUnit paddingBottom() const
+ {
+ return toBoxModel()->paddingBottom();
+ }
+
+ LayoutUnit paddingLeft() const
+ {
+ return toBoxModel()->paddingLeft();
+ }
+
+ LayoutUnit paddingRight() const
+ {
+ return toBoxModel()->paddingRight();
+ }
+
+ LayoutUnit paddingBefore() const
+ {
+ return toBoxModel()->paddingBefore();
+ }
+
+ LayoutUnit paddingAfter() const
+ {
+ return toBoxModel()->paddingAfter();
+ }
+
+ int borderBefore() const
+ {
+ return toBoxModel()->borderBefore();
+ }
+
+ int borderAfter() const
+ {
+ return toBoxModel()->borderAfter();
+ }
+
+ LayoutSize relativePositionLogicalOffset() const
+ {
+ return toBoxModel()->relativePositionLogicalOffset();
+ }
+
+ bool hasInlineDirectionBordersOrPadding() const
+ {
+ return toBoxModel()->hasInlineDirectionBordersOrPadding();
+ }
+
+ LayoutUnit borderAndPaddingLogicalHeight() const
+ {
+ return toBoxModel()->borderAndPaddingLogicalHeight();
+ }
+
private:
LayoutBoxModelObject* toBoxModel() { return toLayoutBoxModelObject(layoutObject()); }
const LayoutBoxModelObject* toBoxModel() const { return toLayoutBoxModelObject(layoutObject()); }
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | Source/core/layout/api/LineLayoutItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698