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