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

Unified Diff: sky/engine/core/rendering/RenderParagraph.cpp

Issue 1200233002: Use the baseline information exposed by C++ to pipe baseline data through RenderBox. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderParagraph.h ('k') | sky/examples/rendering/baseline.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderParagraph.cpp
diff --git a/sky/engine/core/rendering/RenderParagraph.cpp b/sky/engine/core/rendering/RenderParagraph.cpp
index cde5a014399b4afce05935ddf253905c59d74a9d..5b2457ea4ed0028a52a51c80ecf651d00cc16348 100644
--- a/sky/engine/core/rendering/RenderParagraph.cpp
+++ b/sky/engine/core/rendering/RenderParagraph.cpp
@@ -1356,9 +1356,16 @@ void RenderParagraph::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth,
maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
}
-int RenderParagraph::firstLineBoxBaseline() const
+int RenderParagraph::firstLineBoxBaseline(FontBaselineOrAuto baselineType) const
{
- return firstLineBox() ? firstLineBox()->logicalTop() + style(true)->fontMetrics().ascent(firstRootBox()->baselineType()) : -1;
+ if (!firstLineBox())
+ return -1;
+ FontBaseline baseline;
+ if (baselineType.m_auto)
+ baseline = firstRootBox()->baselineType();
+ else
+ baseline = baselineType.m_baseline;
+ return firstLineBox()->logicalTop() + style(true)->fontMetrics().ascent(baseline);
}
int RenderParagraph::lastLineBoxBaseline(LineDirectionMode lineDirection) const
« no previous file with comments | « sky/engine/core/rendering/RenderParagraph.h ('k') | sky/examples/rendering/baseline.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698