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

Unified Diff: sky/engine/core/rendering/RenderBlock.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/RenderBlock.h
diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
index bac68462e7be6a0752610a294826985b865113da..552060b37c5233e2980134dcdf1e7b46e9234410 100644
--- a/sky/engine/core/rendering/RenderBlock.h
+++ b/sky/engine/core/rendering/RenderBlock.h
@@ -216,7 +216,7 @@ protected:
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
virtual void computePreferredLogicalWidths() override;
- virtual int firstLineBoxBaseline() const override;
+ virtual int firstLineBoxBaseline(bool autoBaseline = true, FontBaseline baselineType = AlphabeticBaseline) const override;
eseidel 2015/06/24 23:20:35 There is no need to make these params optional. I
virtual int inlineBlockBaseline(LineDirectionMode) const override;
virtual int lastLineBoxBaseline(LineDirectionMode) const;

Powered by Google App Engine
This is Rietveld 408576698