| 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 3040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3051 LayoutUnit margin = 0; | 3051 LayoutUnit margin = 0; |
| 3052 LayoutUnit marginStart = 0; | 3052 LayoutUnit marginStart = 0; |
| 3053 LayoutUnit marginEnd = 0; | 3053 LayoutUnit marginEnd = 0; |
| 3054 if (startMarginLength.isFixed()) | 3054 if (startMarginLength.isFixed()) |
| 3055 marginStart += startMarginLength.value(); | 3055 marginStart += startMarginLength.value(); |
| 3056 if (endMarginLength.isFixed()) | 3056 if (endMarginLength.isFixed()) |
| 3057 marginEnd += endMarginLength.value(); | 3057 marginEnd += endMarginLength.value(); |
| 3058 margin = marginStart + marginEnd; | 3058 margin = marginStart + marginEnd; |
| 3059 | 3059 |
| 3060 LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth; | 3060 LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth; |
| 3061 if (child->isBox() && child->isHorizontalWritingMode() != isHorizontalWr
itingMode()) { | 3061 child->minMaxPreferredLogicalWidthForParent(childMinPreferredLogicalWidt
h, childMaxPreferredLogicalWidth); |
| 3062 childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = toLa
youtBox(child)->computeLogicalHeightWithoutLayout(); | |
| 3063 } else { | |
| 3064 childMinPreferredLogicalWidth = child->minPreferredLogicalWidth(); | |
| 3065 childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth(); | |
| 3066 } | |
| 3067 | 3062 |
| 3068 LayoutUnit w = childMinPreferredLogicalWidth + margin; | 3063 LayoutUnit w = childMinPreferredLogicalWidth + margin; |
| 3069 minLogicalWidth = std::max(w, minLogicalWidth); | 3064 minLogicalWidth = std::max(w, minLogicalWidth); |
| 3070 | 3065 |
| 3071 // IE ignores tables for calculation of nowrap. Makes some sense. | 3066 // IE ignores tables for calculation of nowrap. Makes some sense. |
| 3072 if (nowrap && !child->isTable()) | 3067 if (nowrap && !child->isTable()) |
| 3073 maxLogicalWidth = std::max(w, maxLogicalWidth); | 3068 maxLogicalWidth = std::max(w, maxLogicalWidth); |
| 3074 | 3069 |
| 3075 w = childMaxPreferredLogicalWidth + margin; | 3070 w = childMaxPreferredLogicalWidth + margin; |
| 3076 | 3071 |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3915 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const | 3910 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const |
| 3916 { | 3911 { |
| 3917 showLayoutObject(); | 3912 showLayoutObject(); |
| 3918 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 3913 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 3919 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 3914 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 3920 } | 3915 } |
| 3921 | 3916 |
| 3922 #endif | 3917 #endif |
| 3923 | 3918 |
| 3924 } // namespace blink | 3919 } // namespace blink |
| OLD | NEW |