| 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 3478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3489 colLogicalTop += index * (colLogicalHeight + colGap); | 3489 colLogicalTop += index * (colLogicalHeight + colGap); |
| 3490 else | 3490 else |
| 3491 colLogicalTop += contentLogicalHeight() - colLogicalHeight - index *
(colLogicalHeight + colGap); | 3491 colLogicalTop += contentLogicalHeight() - colLogicalHeight - index *
(colLogicalHeight + colGap); |
| 3492 } | 3492 } |
| 3493 | 3493 |
| 3494 if (isHorizontalWritingMode()) | 3494 if (isHorizontalWritingMode()) |
| 3495 return LayoutRect(colLogicalLeft, colLogicalTop, colLogicalWidth, colLog
icalHeight); | 3495 return LayoutRect(colLogicalLeft, colLogicalTop, colLogicalWidth, colLog
icalHeight); |
| 3496 return LayoutRect(colLogicalTop, colLogicalLeft, colLogicalHeight, colLogica
lWidth); | 3496 return LayoutRect(colLogicalTop, colLogicalLeft, colLogicalHeight, colLogica
lWidth); |
| 3497 } | 3497 } |
| 3498 | 3498 |
| 3499 bool RenderBlock::relayoutToAvoidWidows(LayoutStateMaintainer& statePusher) | |
| 3500 { | |
| 3501 if (!shouldBreakAtLineToAvoidWidow()) | |
| 3502 return false; | |
| 3503 | |
| 3504 statePusher.pop(); | |
| 3505 setEverHadLayout(true); | |
| 3506 layoutBlock(false); | |
| 3507 return true; | |
| 3508 } | |
| 3509 | |
| 3510 void RenderBlock::adjustPointToColumnContents(LayoutPoint& point) const | 3499 void RenderBlock::adjustPointToColumnContents(LayoutPoint& point) const |
| 3511 { | 3500 { |
| 3512 // Just bail if we have no columns. | 3501 // Just bail if we have no columns. |
| 3513 if (!hasColumns()) | 3502 if (!hasColumns()) |
| 3514 return; | 3503 return; |
| 3515 | 3504 |
| 3516 ColumnInfo* colInfo = columnInfo(); | 3505 ColumnInfo* colInfo = columnInfo(); |
| 3517 if (!columnCount(colInfo)) | 3506 if (!columnCount(colInfo)) |
| 3518 return; | 3507 return; |
| 3519 | 3508 |
| (...skipping 2132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5652 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5641 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 5653 { | 5642 { |
| 5654 showRenderObject(); | 5643 showRenderObject(); |
| 5655 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5644 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 5656 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5645 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 5657 } | 5646 } |
| 5658 | 5647 |
| 5659 #endif | 5648 #endif |
| 5660 | 5649 |
| 5661 } // namespace WebCore | 5650 } // namespace WebCore |
| OLD | NEW |