| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1570 } | 1570 } |
| 1571 | 1571 |
| 1572 LayoutUnit RenderBlock::lineHeight(bool firstLine, LineDirectionMode direction,
LinePositionMode linePositionMode) const | 1572 LayoutUnit RenderBlock::lineHeight(bool firstLine, LineDirectionMode direction,
LinePositionMode linePositionMode) const |
| 1573 { | 1573 { |
| 1574 // Inline blocks are replaced elements. Otherwise, just pass off to | 1574 // Inline blocks are replaced elements. Otherwise, just pass off to |
| 1575 // the base class. If we're being queried as though we're the root line | 1575 // the base class. If we're being queried as though we're the root line |
| 1576 // box, then the fact that we're an inline-block is irrelevant, and we behav
e | 1576 // box, then the fact that we're an inline-block is irrelevant, and we behav
e |
| 1577 // just like a block. | 1577 // just like a block. |
| 1578 if (isReplaced() && linePositionMode == PositionOnContainingLine) | 1578 if (isReplaced() && linePositionMode == PositionOnContainingLine) |
| 1579 return RenderBox::lineHeight(firstLine, direction, linePositionMode); | 1579 return RenderBox::lineHeight(firstLine, direction, linePositionMode); |
| 1580 | 1580 return style()->computedLineHeight(); |
| 1581 RenderStyle* s = style(firstLine && document().styleEngine()->usesFirstLineR
ules()); | |
| 1582 return s->computedLineHeight(); | |
| 1583 } | 1581 } |
| 1584 | 1582 |
| 1585 int RenderBlock::beforeMarginInLineDirection(LineDirectionMode direction) const | 1583 int RenderBlock::beforeMarginInLineDirection(LineDirectionMode direction) const |
| 1586 { | 1584 { |
| 1587 return direction == HorizontalLine ? marginTop() : marginRight(); | 1585 return direction == HorizontalLine ? marginTop() : marginRight(); |
| 1588 } | 1586 } |
| 1589 | 1587 |
| 1590 int RenderBlock::baselinePosition(FontBaseline baselineType, bool firstLine, Lin
eDirectionMode direction, LinePositionMode linePositionMode) const | 1588 int RenderBlock::baselinePosition(FontBaseline baselineType, bool firstLine, Lin
eDirectionMode direction, LinePositionMode linePositionMode) const |
| 1591 { | 1589 { |
| 1592 // Inline blocks are replaced elements. Otherwise, just pass off to | 1590 // Inline blocks are replaced elements. Otherwise, just pass off to |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1971 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 1969 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 1972 { | 1970 { |
| 1973 showRenderObject(); | 1971 showRenderObject(); |
| 1974 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 1972 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 1975 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 1973 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 1976 } | 1974 } |
| 1977 | 1975 |
| 1978 #endif | 1976 #endif |
| 1979 | 1977 |
| 1980 } // namespace blink | 1978 } // namespace blink |
| OLD | NEW |