diff options
Diffstat (limited to 'WebCore/rendering/RenderBox.h')
-rw-r--r-- | WebCore/rendering/RenderBox.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h index ac96bb7..091796b 100644 --- a/WebCore/rendering/RenderBox.h +++ b/WebCore/rendering/RenderBox.h @@ -378,15 +378,15 @@ public: bool isWritingModeRoot() const { return !parent() || parent()->style()->writingMode() != style()->writingMode(); } virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; - virtual int baselinePosition(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; + virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; enum FlippingAdjustment { ChildToParentFlippingAdjustment, ParentToChildFlippingAdjustment }; - IntPoint flipForWritingMode(RenderBox* child, const IntPoint&, FlippingAdjustment); - int flipForWritingMode(int position); - IntPoint flipForWritingMode(const IntPoint&); - IntSize flipForWritingMode(const IntSize&); - void flipForWritingMode(IntRect&); - IntSize locationOffsetIncludingFlipping(); + IntPoint flipForWritingMode(const RenderBox* child, const IntPoint&, FlippingAdjustment) const; + int flipForWritingMode(int position) const; // The offset is in the block direction (y for horizontal writing modes, x for vertical writing modes). + IntPoint flipForWritingMode(const IntPoint&) const; + IntSize flipForWritingMode(const IntSize&) const; + void flipForWritingMode(IntRect&) const; + IntSize locationOffsetIncludingFlipping() const; #ifdef ANDROID_LAYOUT int getVisibleWidth() const { return m_visibleWidth; } |