| 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 3282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3293 | 3293 |
| 3294 bool RenderBlock::requiresColumns(int desiredColumnCount) const | 3294 bool RenderBlock::requiresColumns(int desiredColumnCount) const |
| 3295 { | 3295 { |
| 3296 // Paged overflow is treated as multicol here, unless this element was the o
ne that got its | 3296 // Paged overflow is treated as multicol here, unless this element was the o
ne that got its |
| 3297 // overflow propagated to the viewport. | 3297 // overflow propagated to the viewport. |
| 3298 bool isPaginated = style()->isOverflowPaged() && node() != document().viewpo
rtDefiningElement(); | 3298 bool isPaginated = style()->isOverflowPaged() && node() != document().viewpo
rtDefiningElement(); |
| 3299 | 3299 |
| 3300 return firstChild() | 3300 return firstChild() |
| 3301 && (desiredColumnCount != 1 || !style()->hasAutoColumnWidth() || isPagin
ated) | 3301 && (desiredColumnCount != 1 || !style()->hasAutoColumnWidth() || isPagin
ated) |
| 3302 && !firstChild()->isAnonymousColumnsBlock() | 3302 && !firstChild()->isAnonymousColumnsBlock() |
| 3303 && !firstChild()->isAnonymousColumnSpanBlock(); | 3303 && !firstChild()->isAnonymousColumnSpanBlock() && !isFlexibleBoxIncludin
gDeprecated(); |
| 3304 } | 3304 } |
| 3305 | 3305 |
| 3306 void RenderBlock::setDesiredColumnCountAndWidth(int count, LayoutUnit width) | 3306 void RenderBlock::setDesiredColumnCountAndWidth(int count, LayoutUnit width) |
| 3307 { | 3307 { |
| 3308 bool destroyColumns = !requiresColumns(count); | 3308 bool destroyColumns = !requiresColumns(count); |
| 3309 if (destroyColumns) { | 3309 if (destroyColumns) { |
| 3310 if (hasColumns()) { | 3310 if (hasColumns()) { |
| 3311 gColumnInfoMap->take(this); | 3311 gColumnInfoMap->take(this); |
| 3312 setHasColumns(false); | 3312 setHasColumns(false); |
| 3313 } | 3313 } |
| (...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4848 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 4848 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 4849 { | 4849 { |
| 4850 showRenderObject(); | 4850 showRenderObject(); |
| 4851 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 4851 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 4852 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 4852 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 4853 } | 4853 } |
| 4854 | 4854 |
| 4855 #endif | 4855 #endif |
| 4856 | 4856 |
| 4857 } // namespace blink | 4857 } // namespace blink |
| OLD | NEW |