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

Unified Diff: sky/engine/core/rendering/RenderFlexibleBox.h

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
Index: sky/engine/core/rendering/RenderFlexibleBox.h
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.h b/sky/engine/core/rendering/RenderFlexibleBox.h
index 9d935007d091d9a169402c846005395128e57bae..c4251012b6cee014ca38d5b64ed5e4f2b907dc9d 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.h
+++ b/sky/engine/core/rendering/RenderFlexibleBox.h
@@ -47,7 +47,7 @@ public:
void layout();
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
- virtual int firstLineBoxBaseline() const override;
+ virtual int firstLineBoxBaseline(bool autoBaseline = true, FontBaseline baselineType = AlphabeticBaseline) const override;
virtual int inlineBlockBaseline(LineDirectionMode) const override;
virtual void paintChildren(PaintInfo&, const LayoutPoint&, Vector<RenderBox*>& layers) override final;

Powered by Google App Engine
This is Rietveld 408576698