Chromium Code Reviews| Index: sky/engine/core/rendering/RenderBox.h |
| diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h |
| index 2304e9b79ef326f52692f3ae5ba6a38e106e2d5b..6caac8ee490a5df8e20ef7da027e2797b02d2802 100644 |
| --- a/sky/engine/core/rendering/RenderBox.h |
| +++ b/sky/engine/core/rendering/RenderBox.h |
| @@ -429,7 +429,8 @@ public: |
| RenderLayer* enclosingFloatPaintingLayer() const; |
| - virtual int firstLineBoxBaseline() const { return -1; } |
| + // if autoBaseline is true, baselineType is ignored and determined from the context |
|
eseidel
2015/06/24 23:20:35
Why not just make it a separate method? firstLine
|
| + virtual int firstLineBoxBaseline(bool autoBaseline = true, FontBaseline baselineType = AlphabeticBaseline) const { return -1; } |
| virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // Returns -1 if we should skip this box when computing the baseline of an inline-block. |
| bool isFlexItem() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBox(); } |